X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=13c7a863b7f68e3c420f1fd4bc401410372f62b7;hb=d19f868a2fbfb583e57d9c47b97c0cdb3a95ae57;hp=cdf920b6fadddc6a02344f0f87ae26ff22376d3a;hpb=df7e457273153461399378a243946302ea9a8440;p=ghc-hetmet.git

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index cdf920b..13c7a86 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -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.
+
+ifneq "$(way)" ""
+  way_ := $(way)_
+  _way := _$(way)
+endif
 
-$(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 )
+# 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
@@ -61,9 +63,6 @@ include $(TOP)/mk/opts.mk
 # Variables that control the option flags for all the
 # language processors
 
-include $(TOP)/mk/suffix.mk
-# Suffix rules for Haskell, C and literate 
-
 ifeq "$(BootingFromHc)" "YES"
 include $(TOP)/mk/bootstrap.mk
 endif
@@ -76,4 +75,3 @@ ifndef FAST
 -include .depend
 endif
 # The dependencies file from the current directory
-