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

diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
index 9c55c3b..70f40c5 100644
--- a/ghc/mk/boilerplate.mk
+++ b/ghc/mk/boilerplate.mk
@@ -28,5 +28,12 @@ TOP:=$(GHC_TOP)
 
 -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)