Move the register-inplace special-case stuff into the ghc-prim package

[ghc-hetmet.git] / distrib / Makefile-bin-vars.in

diff --git a/distrib/Makefile-bin-vars.in b/distrib/Makefile-bin-vars.in
index 5603e72..18a73e7 100644 (file)
--- a/distrib/Makefile-bin-vars.in
+++ b/distrib/Makefile-bin-vars.in
@@ -3,7 +3,7 @@
 bindist_abs_root = @hardtop@
 FPTOOLS_TOP_ABS  = @hardtop@
 
-# This Makefile isn't used on Windows, so wel always have ghc-pkg.bin
+# This Makefile isn't used on Windows, so we always have ghc-pkg.bin
 # rather than ghc-pkg.exe.
 GHC_PKG_PROG = $(FPTOOLS_TOP_ABS)/utils/ghc-pkg/ghc-pkg.bin
 
@@ -18,6 +18,8 @@ platform    = @TargetPlatform@
 prefix      = @prefix@
 exec_prefix = @exec_prefix@
 
+mandir      = $(datarootdir)/man
+
 headerdir   = $(libdir)/include
 
 # default
@@ -35,10 +37,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