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

diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
index 96782a0..70f40c5 100644
--- a/ghc/mk/boilerplate.mk
+++ b/ghc/mk/boilerplate.mk
@@ -24,11 +24,16 @@ 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 $(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)