X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=7647f2654d6d7d8a5ebfae8e23d3e8b167845708;hb=637e79ff229838f7f2dc087fe5025e2e3cdda673;hp=b0295b2e6f4bb734df69145b4f1f6f9445b6fc47;hpb=faf341f8e992eb47755e8c3c4452a7cc6aaa874d;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index b0295b2..7647f26 100644
--- 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
 #
@@ -538,6 +543,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 +661,8 @@ SRC_SGML2HTML_OPTS      = -d $(SGMLSTYLESHEET)
 SRC_SGML2PS_OPTS      	= -d $(SGMLSTYLESHEET)
 SRC_SGML2RTF_OPTS       = -d $(SGMLSTYLESHEET)
 
+DOCBOOK_CATALOG		= @Catalog@
+
 #-----------------------------------------------------------------------------
 # 		FPtools support software