X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=94ba7d5743ec745a159b4d8610cc4de684a584d1;hb=fb0f3349561dd4493d81ca7c3a140b37fa0dc0de;hp=3790d7ebfc724d5af87f5ef9c0905fd08aec7736;hpb=351afa5ad7cc7012d5460c126cad4999e457a30d;p=ghc-hetmet.git

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 3790d7e..94ba7d5 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -2,10 +2,10 @@
 #
 #			    mk/boilerplate.mk
 #
-#		The Glorious fptools Boilerplate Makefile
+#		The Glorious GHC Boilerplate Makefile
 #
 # This one file should be included (directly or indirectly) by all Makefiles 
-# in the fptools hierarchy.
+# in the GHC hierarchy.
 #
 #################################################################################
 
@@ -25,21 +25,23 @@ FPTOOLS_TOP := $(TOP)
 #		THIS RULE MUST REMAIN FIRST!
 default: all
 
-
 # -----------------------------------------------------------------------------
-# 	make sure the autoconf stuff is up to date...
+# 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.
 
-$(TOP)/mk/config.mk : $(TOP)/mk/config.mk.in $(TOP)/mk/config.h.in $(TOP)/configure 
-	@if test ! -f $(FPTOOLS_TOP)/config.status; then \
-		echo "You haven't run $(FPTOOLS_TOP)/configure yet."; \
-		exit 1; \
-	fi
-	@echo "Running $(FPTOOLS_TOP)/config.status to update configuration info..."
-	@( cd $(FPTOOLS_TOP) && ./config.status )
+ifneq "$(way)" ""
+  way_ := $(way)_
+  _way := _$(way)
+endif
 
-$(TOP)/configure : $(TOP)/configure.in $(TOP)/aclocal.m4
-	@echo "Regenerating $(FPTOOLS_TOP)/configure..."
-	@( cd $(FPTOOLS_TOP) && $(MAKE) -f Makefile.config ./configure )
+
+# When using $(patsubst ...) and friends, you can't use a literal comma
+# freely - so we use ${comma} instead.  (See PACKAGE_CPP_OPTS in package.mk
+# for an example usage.)
+comma=,
 
 # -----------------------------------------------------------------------------
 # 	Now follow the pieces of boilerplate
@@ -73,4 +75,3 @@ ifndef FAST
 -include .depend
 endif
 # The dependencies file from the current directory
-