X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=distrib%2FMakefile-bin-vars.in;h=18a73e763e05768aa9b5b2f14e1ce0b21135af5a;hp=5a54cbfbb65c967f9e7bda0d4c69e71f0c2be741;hb=ffac2b22970b1671ff0f06b231e36314459307d4;hpb=094f9feafaf83190891736ddd8d1d7213f4293c4

diff --git a/distrib/Makefile-bin-vars.in b/distrib/Makefile-bin-vars.in
index 5a54cbf..18a73e7 100644
--- a/distrib/Makefile-bin-vars.in
+++ b/distrib/Makefile-bin-vars.in
@@ -1,21 +1,32 @@
 
 # Where we are
 bindist_abs_root = @hardtop@
+FPTOOLS_TOP_ABS  = @hardtop@
+
+# 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
 
 # Where the different pieces of the bundle should go:
 bindir      = @bindir@
 libdir      = @libdir@/$(package)-$(version)
 libexecdir  = $(libdir)
+datarootdir = @datarootdir@
 datadir     = @datadir@/$(package)-$(version)
 
 platform    = @TargetPlatform@
 prefix      = @prefix@
 exec_prefix = @exec_prefix@
 
+mandir      = $(datarootdir)/man
+
+headerdir   = $(libdir)/include
+
 # default
-htmldir     = $(datadir)/html
-psdir       = $(datadir)
-pdfdir      = $(datadir)
+docdir      = @datadir@/doc/ghc
+htmldir     = $(docdir)
+psdir       = $(docdir)
+pdfdir      = $(docdir)
 
 
 PERL        = @PerlCmd@
@@ -26,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
 
@@ -44,6 +63,9 @@ INSTALL_LIB     = $(INSTALL) $(INSTALL_LIB_OPTS)
 INSTALL_DATA    = $(INSTALL) $(INSTALL_DATA_OPTS)
 INSTALL_SCRIPT  = $(INSTALL) $(INSTALL_SCRIPT_OPTS)
 INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_OPTS)
+INSTALL_HEADER  = $(INSTALL) $(INSTALL_HEADER_OPTS)
+INSTALL_SHLIB   = $(INSTALL) $(INSTALL_SHLIB_OPTS)
+INSTALL_MAN     = $(INSTALL) $(INSTALL_MAN_OPTS)
 
 # What's common to all installs
 INSTALL_OPTS= $(EXTRA_INSTALL_OPTS)
@@ -56,6 +78,9 @@ INSTALL_LIB_OPTS     = -m $(LIB_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_LIB_OPTS)
 INSTALL_DATA_OPTS    = -m $(LIB_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_DATA_OPTS)
 INSTALL_SCRIPT_OPTS  = -m $(BIN_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_SCRIPT_OPTS)
 INSTALL_PROGRAM_OPTS = -m $(BIN_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_PROGRAM_OPTS)
+INSTALL_HEADER_OPTS  = -m $(LIB_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_HEADER_OPTS)
+INSTALL_SHLIB_OPTS   = -m $(BIN_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_SHLIB_OPTS)
+INSTALL_MAN_OPTS     = -m $(LIB_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_MAN_OPTS)
 
 EXECUTABLE_FILE = chmod $(BIN_PERMS)