[m-rev.] for review: clean up environment variable handling
Simon Taylor
stayl at cs.mu.OZ.AU
Mon Apr 14 16:50:36 AEST 2003
Estimated hours taken: 0.1
Branches: main
Fix bugs in my change to the handling of environment variables.
scripts/mgnuc.in:
Fix a sh syntax error which broke .hl(c) grades.
scripts/mmc.in:
Fix the list of environment variables.
Index: mgnuc.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mgnuc.in,v
retrieving revision 1.97
diff -u -u -r1.97 mgnuc.in
--- mgnuc.in 13 Apr 2003 05:48:35 -0000 1.97
+++ mgnuc.in 14 Apr 2003 06:47:53 -0000
@@ -248,7 +248,7 @@
# The option setting code above guarantees that if
# `--mercury-stdlib-dir' is set, `--mercury-config-dir'
# is also set.
- MERC_ALL_C_INCL_DIRS="-I$mercury_config_dir/conf -I$mercury_stdlib_dir/inc -I$mercury_stdlib_dir/lib/$GRADE/$FULLARCH/inc"}
+ MERC_ALL_C_INCL_DIRS="-I$mercury_config_dir/conf -I$mercury_stdlib_dir/inc -I$mercury_stdlib_dir/lib/$GRADE/$FULLARCH/inc"
;;
esac
Index: mmc.in
===================================================================
RCS file: /home/mercury1/repository/mercury/scripts/mmc.in,v
retrieving revision 1.34
diff -u -u -r1.34 mmc.in
--- mmc.in 13 Apr 2003 05:48:35 -0000 1.34
+++ mmc.in 14 Apr 2003 06:48:17 -0000
@@ -11,8 +11,8 @@
# Use `mmc -h' for help.
#
# Environment variables: MERCURY_STDLIB_DIR, MERCURY_CONFIG_DIR,
-# MERCURY_INT_DIR, MERCURY_ALL_MC_C_INCL_DIRS, MERCURY_COMPILER,
-# MERCURY_C_COMPILER, MERCURY_DEFAULT_GRADE, MERCURY_DEFAULT_OPT_LEVEL.
+# MERCURY_COMPILER, MERCURY_C_COMPILER, MERCURY_DEFAULT_GRADE,
+# MERCURY_DEFAULT_OPT_LEVEL.
MC=${MERCURY_COMPILER="@LIBDIR@/bin/@FULLARCH@/mercury_compile"}
MERCURY_CONFIG_DIR=${MERCURY_CONFIG_DIR-${MERCURY_STDLIB_DIR- at LIBDIR@}}
--------------------------------------------------------------------------
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