diff: fix for some Windows installation problems

[Fergus Henderson]

Estimated hours taken: 1

Mmakefile:
	Fix a bug: the definitions of the variables 
	PREINSTALL_HACK_FOR_WINDOWS and POSTINSTALL_HACK_FOR_WINDOWS
	preceded their use.  The fix was just to move the definitions
	closer to near the start of the file.

README.MS-Windows:
	Update the documentation to reflect gnu-win32 b18.
	Update the patch at the end to reflect the above change to Mmakefile.

cvs diff  Mmakefile README.MS-Windows
Index: Mmakefile
===================================================================
RCS file: /home/staff/zs/imp/mercury/Mmakefile,v
retrieving revision 1.15
diff -u -r1.15 Mmakefile
--- Mmakefile	1997/11/21 12:02:40	1.15
+++ Mmakefile	1998/02/06 15:48:13
@@ -22,6 +22,12 @@
 
 #-----------------------------------------------------------------------------#
 
+# For Windows 95 or Windows NT, uncomment the following two lines:
+# PREINSTALL_HACK = preinstall_hack_for_windows
+# POSTINSTALL_HACK = postinstall_hack_for_windows
+
+#-----------------------------------------------------------------------------#
+
 # `mmake dep' ensures that the .dep files exist;
 # `mmake depend' forces them to be remade to ensure that they are up-to-date.
 
@@ -305,12 +311,6 @@
 #
 # Various horrible hacks for gnu-win32 on Windows.
 #
-
-
-# For Windows 95 or Windows NT, uncomment the following two lines:
-# PREINSTALL_HACK = preinstall_hack_for_windows
-# POSTINSTALL_HACK = postinstall_hack_for_windows
-
 
 # `make touch_files' is a work-around for the broken gnu-win32 `tar'
 # that loses all the file dates.
Index: README.MS-Windows
===================================================================
RCS file: /home/staff/zs/imp/mercury/README.MS-Windows,v
retrieving revision 1.8
diff -u -r1.8 README.MS-Windows
--- README.MS-Windows	1997/11/21 12:02:41	1.8
+++ README.MS-Windows	1998/02/06 15:50:47
@@ -20,22 +20,11 @@
 (If you're going to use a binary distribution of Mercury for Windows,
 you need to make sure that you get a version of gnu-win32 that is
 compatible with the one that the binary distribution was compiled with.
-Currently we suggest using gnu-win32 version b17.1.)
+Currently we suggest using gnu-win32 version b18.)
 
 You can download gnu-win32 from <ftp://ftp.cygnus.com/pub/gnu-win32>.
 
-To install gnu-win32, make a directory say D:\CYGNUS on a file
-system that supports long file names, and unpack the archives
-there.  Make sure that you have C:\tmp and C:\bin directories.
-Copy sh.exe from D:\CYGNUS\H-i386-cygnus\bin to C:\bin.
-Make sure C:\bin is first in your PATH and D:\CYGNUS\H-i386-cygnus\bin
-is second.  Make sure that "." is last in your path.
-Also set these environment variables:
-
-	GCC_EXEC_PREFIX=//D/CYGNUS/H-i386-cygnus/lib/gcc-lib
-	C_INCLUDE_PATH=//D/CYGNUS/H-i386-cygnus/i386-cygwin32/include
-
-Before continuing, check that `bash' and `gcc' work. 
+Once you have installed gnu-win32, check that `bash' and `gcc' work. 
 
 For more information on gnu-win32, see <ftp://ftp.cygnus.com/pub/gnu-win32>
 or <http://www.cygnus.com/misc/gnu-win32/>.
@@ -50,8 +39,11 @@
 
 as described in the INSTALL file.
 
-Reportedly this sometimes results in permission errors, but
-apparently the errors go away if you run configure a second time.
+You may get a few spurious error message dialogue boxes popping up,
+but so long as it keeps going, you can safely ignore them.
+
+Reportedly running configure sometimes results in permission errors,
+but apparently the errors go away if you run configure a second time.
 This is probably due to a bug in gnu-win32.
 
 -----------------------------------------------------------------------------
@@ -74,14 +66,6 @@
 
 	make
 
-Apparently the gnu-win32 gcc for Windows NT is a bit buggier than the
-Linux gcc; it may crash on a few files if you use the default -O2.
-If you run into this problem, put the line `EXTRA_CFLAGS=-O1' in the
-file `Mmake.params'.
-
-You may get a lot of spurious error messages, but so long as it keeps
-going, you should ignore them.
-
 -----------------------------------------------------------------------------
 
 RUNNING MAKE INSTALL
@@ -95,33 +79,32 @@
 USING MERCURY
 
 Once you've finished installing, you need to add the appropriate
-directory, normally /usr/local/mercury-VERSION/bin, to your PATH. 
-But be careful where you add it: it is still important to make sure
-that C:\bin is first in your PATH, and that "." is last in your PATH.
-
-You should be able to read the HTML version of the Mercury documentation,
-which by default gets installed in /usr/local/mercury-VERSION/lib/mercury/html,
-using Netscape or MS Internet Explorer.  Or you can get a copy of GNU Emacs
+directory, normally /usr/local/mercury-<VERSION>/bin, to your PATH. 
+
+You should be able to read the HTML version of the Mercury
+documentation, which by default gets installed in
+/usr/local/mercury-<VERSION>/lib/mercury/html, using Netscape
+or MS Internet Explorer.  Or you can get a copy of GNU Emacs
 for NT and use it to browse the INFO version.
 
 If you use mmake files named `Mmake' rather than `Mmakefile',
-there may still be some problems with case-insensitive filenames
-and the nameclash between `mmake' and `Mmake'.  If you run into any
+there can be some problems with case-insensitive filenames
+and the name clash between `mmake' and `Mmake'.  If you run into any
 such problems, rename your `Mmake' file to `Mmakefile'.
 
 -----------------------------------------------------------------------------
 -----------------------------------------------------------------------------
 
---- Mmakefile.windows	Fri Nov 21 22:55:53 1997
-+++ Mmakefile	Fri Nov 21 22:55:59 1997
-@@ -308,8 +308,8 @@
- 
+--- Mmakefile	Sat Feb  7 02:48:13 1998
++++ Mmakefile.windows	Sat Feb  7 02:49:58 1998
+@@ -23,8 +23,8 @@
+ #-----------------------------------------------------------------------------#
  
  # For Windows 95 or Windows NT, uncomment the following two lines:
--PREINSTALL_HACK = preinstall_hack_for_windows
--POSTINSTALL_HACK = postinstall_hack_for_windows
-+# PREINSTALL_HACK = preinstall_hack_for_windows
-+# POSTINSTALL_HACK = postinstall_hack_for_windows
+-# PREINSTALL_HACK = preinstall_hack_for_windows
+-# POSTINSTALL_HACK = postinstall_hack_for_windows
++PREINSTALL_HACK = preinstall_hack_for_windows
++POSTINSTALL_HACK = postinstall_hack_for_windows
  
+ #-----------------------------------------------------------------------------#
  
- # `make touch_files' is a work-around for the broken gnu-win32 `tar'

-- 
Fergus Henderson <fjh at cs.mu.oz.au>   |  "I have always known that the pursuit
WWW: <http://www.cs.mu.oz.au/~fjh>   |  of excellence is a lethal habit"
PGP: finger fjh at 128.250.37.3         |     -- the last words of T. S. Garp.