X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=ghc%2Fmk%2Fboilerplate.mk;h=0ab3f331a0c083752269140f0593e915402cc27a;hp=96782a0a792c92d3612aa77a0546c0eb2c1cbc9d;hb=28a464a75e14cece5db40f2765a29348273ff2d2;hpb=1fb1ab5d53a09607e7f6d2450806760688396387

diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
index 96782a0..0ab3f33 100644
--- a/ghc/mk/boilerplate.mk
+++ b/ghc/mk/boilerplate.mk
@@ -1,20 +1,16 @@
-#################################################################################
-#
-#			    GHC boilerplate.mk
-#
-#		Boilerplate Makefile for an fptools project
-#
-#################################################################################
+# GHC boilerplate.mk
 
-# Begin by slurping in the boilerplate from one level up.
-# Remember, TOP is the top level of the innermost level
-# (FPTOOLS_TOP is the fptools top)
+GHC_TOP := $(TOP)
+
+# Include this first, because the top-level .mk files might depend on
+# the values of $(ProjectXXX) variables.  (in fact they might/should not, 
+# but we're not brave enough to move this include later --SDM).
+-include $(GHC_TOP)/mk/version.mk
 
 # We need to set TOP to be the TOP that the next level up expects!
 # The TOP variable is reset after the inclusion of the fptools
 # boilerplate, so we stash TOP away first:
-GHC_TOP := $(TOP)
-TOP:=$(TOP)/..
+TOP:=$(GHC_TOP)/..
 
 include $(TOP)/mk/boilerplate.mk
 
@@ -24,11 +20,9 @@ TOP:=$(GHC_TOP)
 # -----------------------------------------------------------------
 # Everything after this point
 # augments or overrides previously set variables.
-# (these files are optional, so `make' won't fret if
-#  cannot get to them).
 # -----------------------------------------------------------------
 
--include $(TOP)/mk/paths.mk
--include $(TOP)/mk/opts.mk
-include $(TOP)/mk/suffix.mk
-
+-include $(GHC_TOP)/mk/config.mk
+-include $(GHC_TOP)/mk/paths.mk
+-include $(GHC_TOP)/mk/opts.mk
+-include $(GHC_TOP)/mk/suffix.mk