X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=mk%2Fboilerplate.mk;h=5f31a258000304b82f9438c4a513f332dd806e3b;hp=13c7a863b7f68e3c420f1fd4bc401410372f62b7;hb=8604da0136707cc14845d14a88c2272fe576b6d0;hpb=a64e5aa07d42843427abc1a24953d39d4319edc6

diff --git a/mk/boilerplate.mk b/mk/boilerplate.mk
index 13c7a86..5f31a25 100644
--- a/mk/boilerplate.mk
+++ b/mk/boilerplate.mk
@@ -2,10 +2,10 @@
 #
 #			    mk/boilerplate.mk
 #
-#		The Glorious fptools Boilerplate Makefile
+#		The Glorious GHC Boilerplate Makefile
 #
 # This one file should be included (directly or indirectly) by all Makefiles 
-# in the fptools hierarchy.
+# in the GHC hierarchy.
 #
 #################################################################################
 
@@ -14,10 +14,13 @@
 # Setting .SUFFIXES to empty disables them all.
 MAKEFLAGS += --no-builtin-rules
 
-# FPTOOLS_TOP is the *relative* path to the fptools toplevel directory from the
+# GHC_TOP is the *relative* path to the fptools toplevel directory from the
 # location where a project Makefile was invoked. It is set by looking at the
 # current value of TOP.
 #
+GHC_TOP := $(TOP)
+
+# $(FPTOOLS_TOP) is the old name for $(GHC_TOP), kept for backwards compat
 FPTOOLS_TOP := $(TOP)
 
 
@@ -67,9 +70,8 @@ ifeq "$(BootingFromHc)" "YES"
 include $(TOP)/mk/bootstrap.mk
 endif
 
--include $(TOP)/mk/build.mk
 # (Optional) build-specific configuration
-#
+include $(TOP)/mk/custom-settings.mk
 
 ifndef FAST
 -include .depend