X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMakefile-bin-vars.in;h=cb69ac675eac115158c576a10f5c1642475d3471;hb=960a5edb6ac87c7d85e36f4b70be8da0175819f7;hp=1b5b8fa71f5ee9451c01efb66714abf62ebf18ea;hpb=4217c6caef9f6d261df1449c590331878a493f14;p=ghc-hetmet.git

diff --git a/distrib/Makefile-bin-vars.in b/distrib/Makefile-bin-vars.in
index 1b5b8fa..cb69ac6 100644
--- a/distrib/Makefile-bin-vars.in
+++ b/distrib/Makefile-bin-vars.in
@@ -12,7 +12,10 @@ bindir      = @bindir@
 libdir      = @libdir@/$(package)-$(version)
 libexecdir  = $(libdir)
 datarootdir = @datarootdir@
-datadir     = @datadir@/$(package)-$(version)
+# 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).
+datadir     = $(libdir)
 
 platform    = @TargetPlatform@
 prefix      = @prefix@
@@ -37,10 +40,18 @@ CP          = cp
 LN_S        = @LN_S@
 CHMOD       = chmod
 INSTALL	    = @INSTALL@
+#
+# Sigh - the autoconf macro for INSTALL will subst a relative path to the fallback
+# install-sh script (if chosen). This not terribly useful to us, so we convert
+# it into an abs. path.
+# 
+INSTALL			:= $(subst ./install-sh,$(FPTOOLS_TOP_ABS)/install-sh,$(INSTALL))
+
 exeext      = @exeext@
 SED	        = @SedCmd@
 DEFAULT_TMPDIR = /tmp
 RANLIB      = @RANLIB@
+CPP         = @CPP@
 
 RAWCPP_FLAGS            = -undef -traditional