X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=distrib%2FMakefile-bin-vars.in;h=08993693e1d2716358643f292990e01bfbefa619;hb=ea372e598d60295e3de24e64c9b44bd50752acf5;hp=0a4fdb98d19892738b1ac685be9cc144daad897d;hpb=79b5a2cb4b9ed5fe41a05fa2ec98bd1f83971daf;p=ghc-hetmet.git

diff --git a/distrib/Makefile-bin-vars.in b/distrib/Makefile-bin-vars.in
index 0a4fdb9..0899369 100644
--- a/distrib/Makefile-bin-vars.in
+++ b/distrib/Makefile-bin-vars.in
@@ -1,58 +1,37 @@
 
 # Where we are
 bindist_abs_root = @hardtop@
+FPTOOLS_TOP_ABS  = @hardtop@
 
-# Where the different pieces of the bundle should go:
-bindir      = @bindir@
-libdir      = @libdir@/$(package)-$(version)
-libexecdir  = $(libdir)
-datadir     = @datadir@/$(package)-$(version)
+# 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
 
 platform    = @TargetPlatform@
-prefix      = @prefix@
-exec_prefix = @exec_prefix@
-
-# default
-htmldir     = $(datadir)/html
-psdir       = $(datadir)
-pdfdir      = $(datadir)
-
 
 PERL        = @PerlCmd@
 SH	    = /bin/sh
-RM          = rm -f
+RM          = rm
+RM_OPTS     = -f
 MV          = mv
 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@
+SED	        = @SedCmd@
 DEFAULT_TMPDIR = /tmp
+RANLIB      = @RANLIB@
+CPP         = @CPP@
 
-#----------end of user-serviceable parts------------
-#
-#
-# How to install the different pieces
-# 
-INSTALL_DIR     = $(bindist_abs_root)/utils/mkdirhier/mkdirhier
-INSTALL_BIN     = $(INSTALL) $(INSTALL_BIN_OPTS)
-INSTALL_LIB     = $(INSTALL) $(INSTALL_LIB_OPTS)
-INSTALL_DATA    = $(INSTALL) $(INSTALL_DATA_OPTS)
-INSTALL_SCRIPT  = $(INSTALL) $(INSTALL_SCRIPT_OPTS)
-INSTALL_PROGRAM = $(INSTALL) $(INSTALL_PROGRAM_OPTS)
-
-# What's common to all installs
-INSTALL_OPTS= $(EXTRA_INSTALL_OPTS)
-
-BIN_PERMS = 755
-LIB_PERMS = 644
-
-INSTALL_BIN_OPTS     = -m $(BIN_PERMS) $(INSTALL_OPTS) $(EXTRA_INSTALL_BIN_OPTS)
-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)
+RAWCPP_FLAGS            = -undef -traditional
 
 EXECUTABLE_FILE = chmod $(BIN_PERMS)