[m-rev.] for review: improve handling of non-installed standard library

[Simon Taylor]

Estimated hours taken: 0.1
Branches: main

Fix bugs in my change to improve the handling of linking
with a non-installed standard library.

scripts/mmake.in:
	Export MERCURY_STDLIB_DIR.

scripts/Mmake.rules:
	Always set MERC_INT_DIR to avoid undefined variable warnings.

Index: Mmake.rules
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/Mmake.rules,v
retrieving revision 1.116
diff -u -u -r1.116 Mmake.rules
--- Mmake.rules	19 Apr 2002 14:59:33 -0000	1.116
+++ Mmake.rules	20 Apr 2002 12:27:19 -0000
@@ -51,6 +51,8 @@
     ifdef MERCURY_STDLIB_DIR
         export MERCURY_STDLIB_DIR
         MERC_INT_DIR = $(MERCURY_STDLIB_DIR)/ints
+    else
+        MERC_INT_DIR =
     endif
 endif
 
Index: mmake.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mmake.in,v
retrieving revision 1.38
diff -u -u -r1.38 mmake.in
--- mmake.in	19 Apr 2002 14:59:36 -0000	1.38
+++ mmake.in	20 Apr 2002 12:25:23 -0000
@@ -181,6 +181,7 @@
 if [ "$MERCURY_STDLIB_DIR" != "" ]
 then
 	MMAKE_DIR=${MMAKE_DIR=$MERCURY_STDLIB_DIR/mmake}
+	export MERCURY_STDLIB_DIR
 fi
 
 case "$MMAKE_DIR" in
--------------------------------------------------------------------------
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
--------------------------------------------------------------------------