X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=944914ed6924228e23abe0d66261c4f567c08960;hb=7cc35327fd1acde88f3474d4e4727f8d8185ff67;hp=2b24421f5f081652de7497690e15ba28dce86df3;hpb=b9d13108742ba43244490e0a90b6c80127561139;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 2b24421..944914e 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -241,6 +241,7 @@ GhcStage3HcOpts=-O2
 
 GhcProfiled=NO
 GhcDebugged=NO
+GhcLibProfiled=NO
 
 # Build shared and/or static libs?
 BuildSharedLibs=@BuildSharedLibs@
@@ -610,9 +611,14 @@ else
 
 # Unix: override libdir and datadir to put ghc-specific stuff in
 # a subdirectory with the version number included.
+#
+# datadir is set to libdir here as GHC needs package.conf and unlit
+# to be in the same place (and things like ghc-pkg need to agree on
+# where package.conf is, so we just set it globally).
+#
 datarootdir := $(datadir0)
-datadir     := $(datadir0)/ghc-$(ProjectVersion)
 libdir      := $(libdir0)/ghc-$(ProjectVersion)
+datadir     := $(libdir)
 
 # New autoconf (>= 2.60?) make a configure with --docdir=DIR etc flags.
 # However, in order to support older autoconf's we don't use them.