X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=cc32c251d34377aebf1d9e2d115bac4a8fb65c2b;hb=dfc15b64151029dd51c423ec5e7baf6096d1ba3f;hp=cdf920b6fadddc6a02344f0f87ae26ff22376d3a;hpb=df7e457273153461399378a243946302ea9a8440;p=ghc-hetmet.git

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index cdf920b..cc32c25 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -39,7 +39,19 @@ $(TOP)/mk/config.mk : $(TOP)/mk/config.mk.in $(TOP)/mk/config.h.in $(TOP)/config
 
 $(TOP)/configure : $(TOP)/configure.in $(TOP)/aclocal.m4
 	@echo "Regenerating $(FPTOOLS_TOP)/configure..."
-	@( cd $(FPTOOLS_TOP) && make -f Makefile.config ./configure )
+	@( cd $(FPTOOLS_TOP) && $(MAKE) -f Makefile.config ./configure )
+
+# -----------------------------------------------------------------------------
+# Misc bits
+
+# If $(way) is set then we define $(way_) and $(_way) from it in the
+# obvious fashion.  This must be done before suffix.mk is included,
+# because the pattern rules in that file depend on these variables.
+
+ifneq "$(way)" ""
+  way_ := $(way)_
+  _way := _$(way)
+endif
 
 # -----------------------------------------------------------------------------
 # 	Now follow the pieces of boilerplate
@@ -61,9 +73,6 @@ include $(TOP)/mk/opts.mk
 # Variables that control the option flags for all the
 # language processors
 
-include $(TOP)/mk/suffix.mk
-# Suffix rules for Haskell, C and literate 
-
 ifeq "$(BootingFromHc)" "YES"
 include $(TOP)/mk/bootstrap.mk
 endif
@@ -76,4 +85,3 @@ ifndef FAST
 -include .depend
 endif
 # The dependencies file from the current directory
-