[m-rev.] trivial diff: fix mmake MERCURY_CONFIG_DIR bug

Simon Taylor stayl at cs.mu.OZ.AU
Sat Aug 2 01:01:46 AEST 2003


Estimated hours taken: 0.1
Branches: main

scripts/mmake.in:
	Fix a bug which caused Mmake to ignore the value of
	MERCURY_STDLIB_DIR when setting MERCURY_CONFIG_DIR.

Index: mmake.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mmake.in,v
retrieving revision 1.42
diff -u -u -r1.42 mmake.in
--- mmake.in	24 Jan 2003 07:17:12 -0000	1.42
+++ mmake.in	1 Aug 2003 14:39:51 -0000
@@ -71,8 +71,8 @@
 		dependency files, and executables.
 "
 
-MERCURY_STDLIB_DIR=${MERCURY_STDLIB_DIR=@LIBDIR@}
-MERCURY_CONFIG_DIR=${MERCURY_CONFIG_DIR=@CONFIG_LIBDIR@}
+MERCURY_CONFIG_DIR=${MERCURY_CONFIG_DIR-${MERCURY_STDLIB_DIR- at CONFIG_LIBDIR@}}
+MERCURY_STDLIB_DIR=${MERCURY_STDLIB_DIR- at LIBDIR@}
 MMAKE_MAKE=${MMAKE_MAKE=@GNU_MAKE@}
 MERCURY_DEFAULT_GRADE=${MERCURY_DEFAULT_GRADE=@DEFAULT_GRADE@}
 MKTEMP=@MKTEMP@
--------------------------------------------------------------------------
mercury-reviews mailing list
post:  mercury-reviews at cs.mu.oz.au
administrative address: owner-mercury-reviews at cs.mu.oz.au
unsubscribe: Address: mercury-reviews-request at cs.mu.oz.au Message: unsubscribe
subscribe:   Address: mercury-reviews-request at cs.mu.oz.au Message: subscribe
--------------------------------------------------------------------------



More information about the reviews mailing list