X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fmk%2Fconfig.mk.in;h=e3060ec20ce7261b6808d62047a8a7420b8c5ce8;hb=d98c897fc102f9b4dab7a030fb454c7a7e2120be;hp=711c90b699497318cf0f7bd4089cde8c1152d417;hpb=054725a03aca2cbfc062985f201bb11d9eb8d632;p=ghc-hetmet.git

diff --git a/ghc/mk/config.mk.in b/ghc/mk/config.mk.in
index 711c90b..e3060ec 100644
--- a/ghc/mk/config.mk.in
+++ b/ghc/mk/config.mk.in
@@ -1,10 +1,11 @@
+# -*-makefile-*-
+# @configure_input@
+
 # -----------------------------------------------------------------------------
-#
-# GHC project configuration
-#
-# This file can only be included from the top of
-# an fptools/ build tree, since the version.mk 'include'
-# reaches in and grabs the project-specific settings.
+# GHC binary distribution configuration
+
+# These settings are used by the top-level Makefile when building
+# binary distributions.
 
 # what to include in a binary distribution
 GhcMainDir = ghc
@@ -16,12 +17,51 @@ else
 GhcBinDistShScripts =
 endif
 
-GhcBinDistPrlScripts = 
+GhcBinDistPrlScripts = ghcprof
 GhcBinDistLibPrlScripts = ghc-asm ghc-split
-GhcBinDistBins = hp2ps ghcprof
+GhcBinDistBins = hp2ps runghc
+GhcBinDistOptBins = runhaskell
 GhcBinDistLinks = ghc ghci ghc-pkg
+GhcBinDistLibSplicedFiles = package.conf
+
+# -----------------------------------------------------------------------------
+# GHC-specific configuration settings
 
 # Set to YES if $(GHC) has the readline package installed
 GhcHasReadline	= @GhcHasReadline@
 
-include $(GhcMainDir)/mk/version.mk
+# GTK+
+GTK_CONFIG = @GTK_CONFIG@
+
+# -----------------------------------------------------------------------------
+
+# We can build using the stage1 compiler by setting UseStage1=YES.
+# This is useful when building up a set of .hc files for
+# bootstrapping, because we need the ghc/lib/compat library and the
+# contents of ghc/utils compiled with the stage1 compiler.
+
+ifeq "$(UseStage1)" "YES"
+HC=$(GHC_STAGE1)
+MKDEPENDHS=$(GHC_STAGE1)
+endif
+
+# Some useful GHC version predicates:
+
+ifeq "$(UseStage1)" "YES"
+ghc_ge_504 = YES
+ghc_ge_601 = YES
+ghc_ge_602 = YES
+ghc_ge_603 = YES
+else
+ifeq "$(BootingFromHc)" "YES"
+ghc_ge_504 = YES
+ghc_ge_601 = YES
+ghc_ge_602 = YES
+ghc_ge_603 = YES
+else
+ghc_ge_504 = $(shell if (test $(GhcCanonVersion) -ge 504); then echo YES; else echo NO; fi)
+ghc_ge_601 = $(shell if (test $(GhcCanonVersion) -ge 601); then echo YES; else echo NO; fi)
+ghc_ge_602 = $(shell if (test $(GhcCanonVersion) -ge 602); then echo YES; else echo NO; fi)
+ghc_ge_603 = $(shell if (test $(GhcCanonVersion) -ge 603); then echo YES; else echo NO; fi)
+endif
+endif