From a32f16b9dd00c28d4fd3d70aafa9a299480b5469 Mon Sep 17 00:00:00 2001 From: Simon Taylor Date: Fri, 1 Aug 2003 15:00:38 +0000 Subject: [PATCH] Fix a bug which caused Mmake to ignore the Estimated hours taken: 0.1 Branches: main scripts/mmake.in: Fix a bug which caused Mmake to ignore the value of MERCURY_CONFIG_DIR. --- scripts/mmake.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/mmake.in b/scripts/mmake.in index 7e34184b7..1f14e1920 100644 --- a/scripts/mmake.in +++ b/scripts/mmake.in @@ -71,8 +71,8 @@ Targets: 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-@CONFIG_LIBDIR@}} +MERCURY_STDLIB_DIR=${MERCURY_STDLIB_DIR-@LIBDIR@} MMAKE_MAKE=${MMAKE_MAKE=@GNU_MAKE@} MERCURY_DEFAULT_GRADE=${MERCURY_DEFAULT_GRADE=@DEFAULT_GRADE@} MKTEMP=@MKTEMP@