[m-dev.] diff: Small fixes for Morphine (0.9.x and main branch)

[Tyson Dowd]

Hi,

These fixes will be committed on the version-0_9_x branch as well
as the main branch.

===================================================================


Estimated hours taken: 1.5

A few fixes for Morphine to make installation easier.

extras/morphine/README:
	Point out that there is a tutorial on the Morphine web page,
	as otherwise it can be difficult to know what to do.

extras/morphine/INSTALL-MORPHINE:
	Use ../../library as the default path for the Mercury library
	files, as this is the normal path if you checkout the CVS
	module.

extras/morphine/source/make_scenario.pl:
	Fix a bug -- use redirection instead of the -i option to patch,
	as many systems don't support -i (e.g. taifun, a Solaris box).


Index: INSTALL-MORPHINE
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/morphine/INSTALL-MORPHINE,v
retrieving revision 1.1.2.1
diff -u -r1.1.2.1 INSTALL-MORPHINE
--- INSTALL-MORPHINE	1999/12/21 09:07:26	1.1.2.1
+++ INSTALL-MORPHINE	2000/01/03 09:59:46
@@ -15,7 +15,7 @@
 rm -f morphine
 
 # Get the Mercury library path (needed in source scenario)
-MmcDefault=/soft/mercury/library
+MmcDefault=../../library
 
 read RESPONSE
Index: README
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/morphine/README,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 README
--- README	1999/12/21 09:07:26	1.2.2.1
+++ README	2000/01/03 09:15:59
@@ -45,12 +45,12 @@
 
 o Architectures: sparc/Solaris2.[5,6,7] and i686/Linux kernel 2.0
 o ECLiPSe 4.1 or later
-o Mercury: later than 1999-15-10 release of the day.
+o Mercury: later than 1999-15-10 release of the day, or version 0.9 or later.
 
 				-o-
 
-For more information about Morphine, you can have a look at the Morphine
-web site:
+For more information about Morphine, including a tutorial on how to use
+the system, please look at the Morphine web site:
 
 http://www.irisa.fr/lande/jahier/download.html
 
Index: source/make_scenario.pl
===================================================================
RCS file: /home/mercury1/repository/mercury/extras/morphine/source/make_scenario.pl,v
retrieving revision 1.2.2.1
diff -u -r1.2.2.1 make_scenario.pl
--- make_scenario.pl	1999/12/21 09:07:35	1.2.2.1
+++ make_scenario.pl	1999/12/30 10:51:01
@@ -37,7 +37,7 @@
 	print(Copy),nl,
 	sh(Copy),
 
-	concat_string(["patch -i ", SourceDir, PatchFile, " ", SourceDir, File], Patch),
+	concat_string(["patch ", SourceDir, File, " ", SourceDir, PatchFile], Patch),
 	print(Patch),nl,
 	sh(Patch).
 


-- 
       Tyson Dowd           # 
                            #  Surreal humour isn't eveyone's cup of fur.
     trd at cs.mu.oz.au        # 
http://www.cs.mu.oz.au/~trd #
--------------------------------------------------------------------------
mercury-developers mailing list
Post messages to:       mercury-developers at cs.mu.oz.au
Administrative Queries: owner-mercury-developers at cs.mu.oz.au
Subscriptions:          mercury-developers-request at cs.mu.oz.au
--------------------------------------------------------------------------