[m-dev.] diff: fix error in install message

[Fergus Henderson]

In mail to mercury-bugs,
on 23-Sep-2000, David Glen Jeffery <dgj at students.cs.mu.OZ.AU> wrote:
> At the end of a `mmake install', a message is given telling the user to
> add <blah> to their path. However, <blah> is wrong: it is the name of the
> mercury directory *currently* in the user's path, not the name of the newly
> installed-to directory.

This problem seems to have beenn introduced by Warwick's change to
move the definitions of INSTALL_LIBDIR etc. from Mmake.common.in
to scripts/Mmake.vars.in.  I think this diff should solve the problem.

----------

Estimated hours taken: 0.5

Mmakefile:
	Include scripts/Mmake.vars.in, so that we pick up the right
	configuration settings (e.g. --prefix), rather than using the
	configuration settings from the old `mmake' that we're installing with.

Workspace: /home/pgrad/fjh/ws/hg
Index: Mmakefile
===================================================================
RCS file: /home/mercury1/repository/mercury/Mmakefile,v
retrieving revision 1.58
diff -u -d -r1.58 Mmakefile
--- Mmakefile	2000/08/17 16:26:11	1.58
+++ Mmakefile	2000/09/25 05:51:09
@@ -6,6 +6,15 @@
 
 # Mmakefile - the top-level Mmake file for the Mercury implementation
 
+# We need to explicitly include scripts/Mmake.vars here, even though `mmake'
+# includes that file automatically, to make sure that we get the right
+# version of that file.  The settings in that file include values set
+# by parameters to configure (e.g. --prefix), and we need to make sure
+# that we pick up the values from the Mmake.vars that we're going to install,
+# rather than from the old version of mmake that we're installing with,
+# which may have been configured with a different --prefix.
+include scripts/Mmake.vars
+
 MAIN_TARGET=all
 
 MERCURY_DIR=.

-- 
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.
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------