FPTOOLS_TOP_ABS = @hardtop@
BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TOPDIR_REL=$(FPTOOLS_TOP)
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
+BIN_DIST_TARBALL=$(FPTOOLS_TOP_ABS)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2
# 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
libdir0 := @libdir@
includedir := @includedir@
mandir := @mandir@
+dynlibdir := @libdir@
ifeq "$(RelocatableBuild)" "YES"
# 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
# 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))" ""
GhcMajVersion = @GhcMajVersion@
GhcMinVersion = @GhcMinVersion@
-ghc_ge_601 = YES
-ghc_ge_602 = YES
-ghc_ge_603 = YES
ghc_ge_605 = YES
ghc_ge_607 = YES
GhcMinVersion = @GhcMinVersion@
# Some useful GHC version predicates:
-ghc_ge_601 = @ghc_ge_601@
-ghc_ge_602 = @ghc_ge_602@
-ghc_ge_603 = @ghc_ge_603@
ghc_ge_605 = @ghc_ge_605@
ghc_ge_607 = @ghc_ge_607@
endif
TAR = @TarCmd@
ZIP = zip
+HSCOLOUR = @HSCOLOUR@
+
#
# This is special to literate/, ToDo: add literate-specific
# configure setup to literate/.
#
# Options to pass to Happy when we're going to compile the output with GHC
#
-GHC_HAPPY_OPTS = -agc
+GHC_HAPPY_OPTS = -agc --strict
# Temp. to work around performance problems in the HEAD around 8/12/2003,
# A Happy compiled with this compiler needs more stack.
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)
+