summaryrefslogtreecommitdiff
path: root/mk/config.mk.in
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2008-08-25 14:16:53 +0000
committerIan Lynagh <igloo@earth.li>2008-08-25 14:16:53 +0000
commit689e628279a6bf932d996c3c132ab53f9587027e (patch)
treeabb4702b1f5d3d2ff2f8e0d427de11ece6850d42 /mk/config.mk.in
parent94368cd8a82872a16ee07ed8444a37939f3fe482 (diff)
downloadhaskell-689e628279a6bf932d996c3c132ab53f9587027e.tar.gz
Set datadir=libdir; fixes trac #2541
GHC needs package.conf and things like unlit to be in the same place
Diffstat (limited to 'mk/config.mk.in')
-rw-r--r--mk/config.mk.in7
1 files changed, 6 insertions, 1 deletions
diff --git a/mk/config.mk.in b/mk/config.mk.in
index 2b24421f5f..74589ae5ee 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -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.