X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=b241dc946aa0efe80257ef7306a48415b81b1eac;hb=047864943968324c12c9252c69f32672bec241cb;hp=32176c18b61c81c476361df45355886055d0232e;hpb=7b156c451f0e2fa87a1111a2ab8e4bd6d29e5a0f;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 32176c1..b241dc9 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -512,8 +512,6 @@ BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS)
 BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME)
 BIN_DIST_TARBALL=$(BIN_DIST_TOPDIR_REL)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2
 
-BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/installed
-
 # Definition of installation directories, we don't use half of these, but since
 # the configure script has them on offer while passing through, we might as well
 # set them. Note that we have to be careful, because the GNU coding standards
@@ -559,6 +557,7 @@ datadir0        := @datadir@
 libdir0         := @libdir@
 includedir      := @includedir@
 mandir          := @mandir@
+dynlibdir       := @libdir@
 
 ifeq "$(RelocatableBuild)" "YES"
 
@@ -672,8 +671,6 @@ SRC_HC_OPTS += -H16m -O
 # These flags make flex 8-bit
 SRC_FLEX_OPTS	+= -8
 
-SRC_INSTALL_BIN_OPTS	+= -s
-
 # lint gets all CPP's flags too
 SRC_LINT_OPTS		+= -axz -DLINT $(SRC_CPP_OPTS)
 WAY$(_way)_LINT_OPTS	+= WAY$(_way)_CPP_OPTS
@@ -859,9 +856,14 @@ NHC		= @NHC@
 # tree).  We can refer to "this ghc" as $(GHC_INPLACE):
 
 GHC_INPLACE 	= $(GHC_COMPILER_DIR)/ghc-inplace
-GHC_STAGE1 	= $(GHC_COMPILER_DIR)/stage1/ghc-inplace
-GHC_STAGE2 	= $(GHC_COMPILER_DIR)/stage2/ghc-inplace
-GHC_STAGE3 	= $(GHC_COMPILER_DIR)/stage3/ghc-inplace
+GHC_STAGE1 	= $(GHC_COMPILER_DIR)/stage1/ghc-inplace -no-user-package-conf
+GHC_STAGE2 	= $(GHC_COMPILER_DIR)/stage2/ghc-inplace -no-user-package-conf
+GHC_STAGE3 	= $(GHC_COMPILER_DIR)/stage3/ghc-inplace -no-user-package-conf
+
+# NOTE: add -no-user-package-conf for stage 1-3 above, so that
+# we avoid picking up any packages the user might happen to have
+# installed for this GHC version.  They are bound to be incompatible
+# with the packages we built in the tree.
 
 ifneq "$(findstring YES, $(UseStage1) $(BootingFromHc))" ""
 
@@ -1043,6 +1045,8 @@ STRIP			= strip
 TAR			= @TarCmd@
 ZIP			= zip
 
+HSCOLOUR = @HSCOLOUR@
+
 #
 # This is special to literate/, ToDo: add literate-specific
 # configure setup to literate/.
@@ -1313,3 +1317,18 @@ WAY_o_HC_OPTS=
 
 CONFIGURE_ARGS = @CONFIGURE_ARGS@
 
+################################################################################
+#
+#    Bindist testing directory
+#
+################################################################################
+
+ifeq "$(Windows)" "YES"
+BIN_DIST_INST_SUBDIR = "install dir"
+else
+# I very much doubt that paths with spaces will work on Unix
+BIN_DIST_INST_SUBDIR = installed
+endif
+
+BIN_DIST_INST_DIR = $(FPTOOLS_TOP_ABS)/bindisttest/$(BIN_DIST_INST_SUBDIR)
+