[project @ 2004-08-21 13:29:26 by panne]

[ghc-hetmet.git] / mk / boilerplate.mk

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index cc32c25..2e9f963 100644 (file)
--- 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