Don't use the absolute path to the bindist tarball

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 59446a9..5bcd5f9 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -187,6 +187,8 @@ XMLDocWays=
 
 # Should we build haddock docs?
 HADDOCK_DOCS = YES
+# And HsColour the sources?
+HSCOLOUR_SRCS = YES
 
 # Should we build latex docs?
 LATEX_DOCS = NO
@@ -279,9 +281,8 @@ endif
 #
 # Target platforms supported:
 #   i386, powerpc
-#   sparc has bitrotted
 #   AIX is not supported 
-ArchSupportsNCG=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc)))
+ArchSupportsNCG=$(strip $(patsubst $(HostArch_CPP), YES, $(findstring $(HostArch_CPP), i386 x86_64 powerpc sparc)))
 OsSupportsNCG=$(strip $(patsubst $(HostOS_CPP), YES, $(patsubst aix,,$(HostOS_CPP))))
 
 # lazy test, because $(GhcUnregisterised) might be set in build.mk later.
@@ -398,7 +399,7 @@ GhcRTSWays += debug
 endif
 
 ifeq "$(BuildSharedLibs)" "YES"
-GhcRTSWays += debug_dyn thr_dyn thr_debug_dyn
+GhcRTSWays += dyn debug_dyn thr_dyn thr_debug_dyn
 endif
 
 # Want the threaded versions unless we're unregisterised
@@ -459,7 +460,7 @@ LIBM=@LIBM@
 
 # .NET interop support?
 #
-DotnetSupport=@DotnetSupport@
+DotnetSupport=NO
 
 # Build unix package?
 #
@@ -546,7 +547,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)
@@ -929,14 +930,12 @@ GhcPatchLevel     = @ProjectPatchLevel@
 GhcMajVersion  = @GhcMajVersion@
 GhcMinVersion  = @GhcMinVersion@
 
-ghc_ge_605 = YES
 ghc_ge_607 = YES
 ghc_ge_609 = YES
 
 else # not UseStage1 or BootingFromHc
 
 # Some useful GHC version predicates:
-ghc_ge_605 = @ghc_ge_605@
 ghc_ge_607 = @ghc_ge_607@
 ghc_ge_609 = @ghc_ge_609@