X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=74589ae5ee2d511edb57a6db45b12fa99dcf260f;hb=689e628279a6bf932d996c3c132ab53f9587027e;hp=b1b54f31ee47efdbe33090b435c8b5c806c058bb;hpb=cd759f053d3f54fe62e1b5f3f74ec5c8f4c10893;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index b1b54f3..74589ae 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -531,7 +531,7 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 DEFAULT_TMPDIR		= /C/TEMP
 endif
 
-# FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
+# FPTOOLS_TOP_ABS: the top of the fptools hierarchy, absolute path.
 # On Windows this is a c:/foo/bar style path.
 FPTOOLS_TOP_ABS		= @hardtop@
 
@@ -610,9 +610,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.