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

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 3790d7e..2e9f963 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -37,11 +37,29 @@ $(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 )
 
 # -----------------------------------------------------------------------------
+# 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
+
+
+# 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
 
@@ -73,4 +91,3 @@ ifndef FAST
 -include .depend
 endif
 # The dependencies file from the current directory
-