X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=94ba7d5743ec745a159b4d8610cc4de684a584d1;hb=1994438bb2a4e052a267744dcec9efb6f8bd3e97;hp=cc32c251d34377aebf1d9e2d115bac4a8fb65c2b;hpb=4bb9980e0c3c18e93262abc37f3efe36a9f11b07;p=ghc-hetmet.git

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index cc32c25..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,22 +25,6 @@ FPTOOLS_TOP := $(TOP)
 #		THIS RULE MUST REMAIN FIRST!
 default: all
 
-
-# -----------------------------------------------------------------------------
-# 	make sure the autoconf stuff is up to date...
-
-$(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 )
-
-$(TOP)/configure : $(TOP)/configure.in $(TOP)/aclocal.m4
-	@echo "Regenerating $(FPTOOLS_TOP)/configure..."
-	@( cd $(FPTOOLS_TOP) && $(MAKE) -f Makefile.config ./configure )
-
 # -----------------------------------------------------------------------------
 # Misc bits
 
@@ -53,6 +37,12 @@ ifneq "$(way)" ""
   _way := _$(way)
 endif
 
+
+# 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
 #	The "-" signs tell make not to complain if they don't exist