diff --git a/scripts/Mmake.rules b/scripts/Mmake.rules index 9f1c72e4a..4d7054380 100644 --- a/scripts/Mmake.rules +++ b/scripts/Mmake.rules @@ -43,18 +43,6 @@ ALL_MGNUCFLAGS += -I. -I$(mihs_subdir). endif -#-----------------------------------------------------------------------------# -# -# Find the directory containing the interface files for the standard library. -# - -ifdef MERCURY_STDLIB_DIR - export MERCURY_STDLIB_DIR - MERC_INT_DIR = $(MERCURY_STDLIB_DIR)/ints -else - MERC_INT_DIR = -endif - #-----------------------------------------------------------------------------# .PRECIOUS: $(date0s_subdir)%.date0 diff --git a/scripts/Mmake.vars.in b/scripts/Mmake.vars.in index d07e9dc31..0eca0f257 100644 --- a/scripts/Mmake.vars.in +++ b/scripts/Mmake.vars.in @@ -15,6 +15,14 @@ # Ensure that commands use /bin/sh not the user's shell SHELL = /bin/sh +# The directory containing the interface files for the standard library. +ifdef MERCURY_STDLIB_DIR + export MERCURY_STDLIB_DIR + MERC_INT_DIR = $(MERCURY_STDLIB_DIR)/ints +else + MERC_INT_DIR = +endif + ALL_EXTRA_LIBRARIES = $(TARGET_EXTRA_LIBRARIES) $(EXTRA_LIBRARIES) EXTRA_LIB_DIRS = EXTRA_LIBRARIES =