[project @ 2000-07-11 12:17:02 by rrt]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 8b5879e..0eec930 100644 (file)
--- 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