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

diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
index 70f40c5..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
 
@@ -26,14 +22,7 @@ TOP:=$(GHC_TOP)
 # augments or overrides previously set variables.
 # -----------------------------------------------------------------
 
--include $(TOP)/mk/paths.mk
--include $(TOP)/mk/opts.mk
--include $(TOP)/mk/version.mk
--include $(TOP)/mk/suffix.mk
-
-# -----------------------------------------------------------------
-# Override $(libdir) and $(datadir), so GHC stuff gets installed 
-# into a suitable subdirectory of $(libdir).
-
-libdir  := $(libdir)/$(ProjectNameShort)-$(ProjectVersion)
-datadir := $(datadir)/$(ProjectNameShort)-$(ProjectVersion)
+-include $(GHC_TOP)/mk/config.mk
+-include $(GHC_TOP)/mk/paths.mk
+-include $(GHC_TOP)/mk/opts.mk
+-include $(GHC_TOP)/mk/suffix.mk