X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fmk%2Fboilerplate.mk;h=ec155f0abb9ddc71bf5bf783453f1952ac36f280;hb=02e6e233d5325b1485b090049db998e4d7026906;hp=05e77e2e75f354bb9ede4010fcb38cbd66b15667;hpb=085cb439cd2a2ba828b45182dff629bd4f51d308;p=ghc-hetmet.git

diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
index 05e77e2..ec155f0 100644
--- a/ghc/mk/boilerplate.mk
+++ b/ghc/mk/boilerplate.mk
@@ -10,6 +10,8 @@
 # Remember, TOP is the top level of the innermost level
 # (FPTOOLS_TOP is the fptools top)
 
+-include $(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:
@@ -28,13 +30,10 @@ TOP:=$(GHC_TOP)
 
 -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).
+# Override $(libexecdir): we like our binaries in a subdirectory
+# of $(libdir).
 
-libdir     := $(libdir)/$(ProjectNameShort)-$(ProjectVersion)
-libexecdir := $(libdir)/bin
-datadir    := $(datadir)/$(ProjectNameShort)-$(ProjectVersion)
+libexecdir := $(libdir)/extra-bin