Fix a bug which sometimes caused extra major GCs to be performed

[ghc-hetmet.git] / mk / config.mk.in

diff --git a/mk/config.mk.in b/mk/config.mk.in
index bf97a16..6f16dd5 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -185,11 +185,6 @@ BootingFromUnregisterisedHc = @BootingFromUnregisterisedHc@
 #
 XMLDocWays=
 
-# Should we build haddock docs?
-HADDOCK_DOCS = YES
-# And HsColour the sources?
-HSCOLOUR_SRCS = YES
-
 # Should we build latex docs?
 LATEX_DOCS = NO
 
@@ -547,7 +542,7 @@ BIN_DIST_TOPDIR_ABS=$(FPTOOLS_TOP_ABS)
 BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME)
 
 BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TAR=$(FPTOOLS_TOP_ABS)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar
+BIN_DIST_TAR=$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar
 BIN_DIST_TAR_BZ2=$(BIN_DIST_TAR).bz2
 BIN_DIST_PREP_DIR=$(FPTOOLS_TOP_ABS)/bindist-prep
 BIN_DIST_PREP=$(BIN_DIST_PREP_DIR)/$(BIN_DIST_NAME)
@@ -1192,6 +1187,15 @@ ALEX_VERSION             = @AlexVersion@
 #
 GHC_ALEX_OPTS          = -g
 
+# Should we build haddock docs?
+HADDOCK_DOCS = YES
+# And HsColour the sources?
+ifeq "$(HSCOLOUR)" ""
+HSCOLOUR_SRCS = NO
+else
+HSCOLOUR_SRCS = YES
+endif
+
 #
 # Options for compiling in different `ways'. 
 #