X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=0eec930b4aeacc83418babbc15cb8f5646a16a55;hb=b0624daa9057eec25ddf35a9ed3c771b9c5d9c75;hp=8b5879e7216781c0f84125e11791c3bfcf42f416;hpb=279826fcdd5d8e53e87c03d2f49355b6138a0efc;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 8b5879e..0eec930 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -509,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@
 
@@ -543,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,12 +661,12 @@ SGML2RTF		= $(DOCBOOK_PREFIX)db2rtf
 
 SGMLSTYLESHEET          = $(FPTOOLS_TOP_ABS)/docs/fptools-both.dsl
 
-SRC_SGML2DVI_OPTS       = $(DOCBOOK_CATALOG) -d $(SGMLSTYLESHEET)
-SRC_SGML2HTML_OPTS      = $(DOCBOOK_CATALOG) -d $(SGMLSTYLESHEET)
-SRC_SGML2PS_OPTS      	= $(DOCBOOK_CATALOG) -d $(SGMLSTYLESHEET)
-SRC_SGML2RTF_OPTS       = $(DOCBOOK_CATALOG) -d $(SGMLSTYLESHEET)
+SRC_SGML2DVI_OPTS       = -d $(SGMLSTYLESHEET)
+SRC_SGML2HTML_OPTS      = -d $(SGMLSTYLESHEET)
+SRC_SGML2PS_OPTS      	= -d $(SGMLSTYLESHEET)
+SRC_SGML2RTF_OPTS       = -d $(SGMLSTYLESHEET)
 
-DOCBOOK_CATALOG		= $(FPTOOLS_TOP_ABS)/@Catalog@
+DOCBOOK_CATALOG		= @Catalog@
 
 #-----------------------------------------------------------------------------
 # 		FPtools support software