[project @ 2000-06-30 09:34:09 by simonmar]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index b0295b2..0eec930 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -1,4 +1,4 @@
-#
+#                                                               -*-makefile-*-
 # @configure_input@
 #
 ################################################################################
@@ -110,7 +110,12 @@ exeext=@exeext@
 #              * ghc next
 #              then it's up to you
 
+ifeq "$(GhcWithHscBuiltViaC)" "YES"
+# need hslibs/lang first if we're bootstrapping
+ProjectsToBuild   = glafp-utils hslibs ghc
+else
 ProjectsToBuild   = glafp-utils ghc hslibs
+endif
 #
 # Make a distinction between building and installing
 #
@@ -504,6 +509,11 @@ HSTAGS_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/hstags/
 # $(MKDEPENDHS) is the Haskell dependency generator (ghc -M).
 
 GHC            = @GHC@
+GhcVersion     = @GhcVersion@
+GhcMajVersion  = @GhcMajVersion@
+GhcMinVersion  = @GhcMinVersion@
+GhcPatchLevel  = @GhcPatchLevel@
+
 HBC            = @HBC@
 NHC            = @NHC@
 
@@ -538,6 +548,12 @@ HaveLibGmp = @HaveLibGmp@
 LibGmp         = @LibGmp@
 
 #-----------------------------------------------------------------------------
+# Regex library 
+# (if present in libc use that one, otherwise use the one in the tree)
+#
+HaveRegex      = @HaveRegex@
+
+#-----------------------------------------------------------------------------
 # Flex
 
 FLEX                   = @LEX@
@@ -650,6 +666,8 @@ SRC_SGML2HTML_OPTS      = -d $(SGMLSTYLESHEET)
 SRC_SGML2PS_OPTS       = -d $(SGMLSTYLESHEET)
 SRC_SGML2RTF_OPTS       = -d $(SGMLSTYLESHEET)
 
+DOCBOOK_CATALOG                = @Catalog@
+
 #-----------------------------------------------------------------------------
 #              FPtools support software