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

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index cc32c25..2e9f963 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -37,7 +37,7 @@ $(TOP)/mk/config.mk : $(TOP)/mk/config.mk.in $(TOP)/mk/config.h.in $(TOP)/config
 	@echo "Running $(FPTOOLS_TOP)/config.status to update configuration info..."
 	@( cd $(FPTOOLS_TOP) && ./config.status )
 
-$(TOP)/configure : $(TOP)/configure.in $(TOP)/aclocal.m4
+$(TOP)/configure : $(TOP)/configure.ac $(TOP)/aclocal.m4
 	@echo "Regenerating $(FPTOOLS_TOP)/configure..."
 	@( cd $(FPTOOLS_TOP) && $(MAKE) -f Makefile.config ./configure )
 
@@ -53,6 +53,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