Install the RTS from a bindist correctly

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index ae7b743..5406c72 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -171,6 +171,12 @@ else
 Windows=NO
 endif
 
+ifeq "$(Windows)" "YES"
+dot_bat=.bat
+else
+dot_bat=
+endif
+
 # BootingFromHc - build GHC and the libraries from .hc files?
 BootingFromHc = @BootingFromHc@
 
@@ -350,9 +356,9 @@ GhcRTSWays += debug
 endif
 
 # Want the threaded versions unless we're unregisterised
-ifeq "$(GhcUnregisterised)" "NO"
-GhcRTSWays += thr thr_p thr_debug
-endif
+# Defer the check until later by using $(if..), because GhcUnregisterised might
+# be set in build.mk, which hasn't been read yet.
+GhcRTSWays += $(if $(findstring NO, $(GhcUnregisterised)),thr thr_p thr_debug,)
 
 # Option flags to pass to GHC when it's compiling modules in
 # fptools/libraries.  Typically these are things like -O or
@@ -752,7 +758,7 @@ GHC_TOUCHY_PGM              = touchy$(exeext)
 GHC_MANGLER_PGM                = ghc-asm
 GHC_SPLIT_PGM          = ghc-split
 GHC_SYSMAN_PGM                 = SysMan
-GHC_PKG_INPLACE_PGM    = ghc-pkg-inplace
+GHC_PKG_INPLACE_PGM    = ghc-pkg-inplace$(dot_bat)
 GHC_GENPRIMOP_PGM      = genprimopcode
 GHC_GENAPPLY_PGM       = genapply
 GHC_MKDEPENDC_PGM      = mkdependC
@@ -786,6 +792,7 @@ LNDIR                       = $(GHC_LNDIR_DIR)/$(GHC_LNDIR_PGM)
 RUNTEST                        = $(GHC_RUNTEST_DIR)/$(GHC_RUNTEST_PGM)
 
 GENERATED_FILE  = chmod a-w
+EXECUTABLE_FILE = chmod +x
 
 #-----------------------------------------------------------------------------
 # Haskell compilers and mkdependHS