[project @ 2001-06-15 11:29:47 by simonmar]

[ghc-hetmet.git] / ghc / mk / boilerplate.mk

diff --git a/ghc/mk/boilerplate.mk b/ghc/mk/boilerplate.mk
index 08e36c9..05e77e2 100644 (file)
--- a/ghc/mk/boilerplate.mk
+++ b/ghc/mk/boilerplate.mk
@@ -26,7 +26,15 @@ TOP:=$(GHC_TOP)
 # augments or overrides previously set variables.
 # -----------------------------------------------------------------
 
-include $(TOP)/mk/paths.mk
-include $(TOP)/mk/opts.mk
-include $(TOP)/mk/suffix.mk
+-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)
+libexecdir := $(libdir)/bin
+datadir    := $(datadir)/$(ProjectNameShort)-$(ProjectVersion)