X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=13c7a863b7f68e3c420f1fd4bc401410372f62b7;hb=0372ac231bd18e993a2533f784805046876d5527;hp=d20d1678ae6a82e2282329c35ea0c32d35fdefee;hpb=50027272414438955dbc41696541cbd25da55883;p=ghc-hetmet.git

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index d20d167..13c7a86 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -25,10 +25,27 @@ FPTOOLS_TOP := $(TOP)
 #		THIS RULE MUST REMAIN FIRST!
 default: all
 
+# -----------------------------------------------------------------------------
+# 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.
 
-# 		Now follow the pieces of boilerplate
-#		The "-" signs tell make not to complain if they don't exist
+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
 
 include $(TOP)/mk/config.mk
 # All configuration information
@@ -46,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
@@ -61,4 +75,3 @@ ifndef FAST
 -include .depend
 endif
 # The dependencies file from the current directory
-