projects
/
ghc-hetmet.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[project @ 2000-07-18 17:29:53 by rrt]
[ghc-hetmet.git]
/
mk
/
config.mk.in
diff --git
a/mk/config.mk.in
b/mk/config.mk.in
index
ca8a553
..
25c7e32
100644
(file)
--- a/
mk/config.mk.in
+++ b/
mk/config.mk.in
@@
-1,4
+1,4
@@
-#
+# -*-makefile-*-
# @configure_input@
#
################################################################################
# @configure_input@
#
################################################################################
@@
-492,10
+492,8
@@
HAPPY_PREFIX = $(FPTOOLS_TOP)/happy/src/
GREENCARD_PREFIX = $(FPTOOLS_TOP)/green-card/src/
UNLIT_PREFIX = $(FPTOOLS_TOP)/ghc/utils/unlit/
GREENCARD_PREFIX = $(FPTOOLS_TOP)/green-card/src/
UNLIT_PREFIX = $(FPTOOLS_TOP)/ghc/utils/unlit/
-UGEN_PREFIX = $(FPTOOLS_TOP)/ghc/utils/ugen/
STAT2RESID_PREFIX = $(FPTOOLS_TOP)/ghc/utils/stat2resid/
HP2PS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hp2ps/
STAT2RESID_PREFIX = $(FPTOOLS_TOP)/ghc/utils/stat2resid/
HP2PS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hp2ps/
-HSCPP_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hscpp/
HSTAGS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hstags/
HSTAGS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hstags/
@@
-509,6
+507,11
@@
HSTAGS_PREFIX = $(FPTOOLS_TOP)/ghc/utils/hstags/
# $(MKDEPENDHS) is the Haskell dependency generator (ghc -M).
GHC = @GHC@
# $(MKDEPENDHS) is the Haskell dependency generator (ghc -M).
GHC = @GHC@
+GhcVersion = @GhcVersion@
+GhcMajVersion = @GhcMajVersion@
+GhcMinVersion = @GhcMinVersion@
+GhcPatchLevel = @GhcPatchLevel@
+
HBC = @HBC@
NHC = @NHC@
HBC = @HBC@
NHC = @NHC@
@@
-543,6
+546,12
@@
HaveLibGmp = @HaveLibGmp@
LibGmp = @LibGmp@
#-----------------------------------------------------------------------------
LibGmp = @LibGmp@
#-----------------------------------------------------------------------------
+# Regex library
+# (if present in libc use that one, otherwise use the one in the tree)
+#
+HaveRegex = @HaveRegex@
+
+#-----------------------------------------------------------------------------
# Flex
FLEX = @LEX@
# Flex
FLEX = @LEX@
@@
-620,7
+629,7
@@
ZIP = zip
#
# Under Windows, we have to deal with .exe suffixes
#
#
# Under Windows, we have to deal with .exe suffixes
#
-EXE_SUFFIX=@ExeSuffix@
+EXE_SUFFIX=@exeext@
#
# This is special to literate/, ToDo: add literate-specific
#
# This is special to literate/, ToDo: add literate-specific
@@
-655,6
+664,8
@@
SRC_SGML2HTML_OPTS = -d $(SGMLSTYLESHEET)
SRC_SGML2PS_OPTS = -d $(SGMLSTYLESHEET)
SRC_SGML2RTF_OPTS = -d $(SGMLSTYLESHEET)
SRC_SGML2PS_OPTS = -d $(SGMLSTYLESHEET)
SRC_SGML2RTF_OPTS = -d $(SGMLSTYLESHEET)
+DOCBOOK_CATALOG = @Catalog@
+
#-----------------------------------------------------------------------------
# FPtools support software
#-----------------------------------------------------------------------------
# FPtools support software
@@
-668,14
+679,22
@@
ETAGS = $(ETAGS_PREFIX)etags
VERBATIM = $(VERBATIM_PREFIX)verbatim
SGMLVERB = $(SGMLVERB_PREFIX)sgmlverb
RUNTEST = $(RUNTEST_PREFIX)runstdtest
VERBATIM = $(VERBATIM_PREFIX)verbatim
SGMLVERB = $(SGMLVERB_PREFIX)sgmlverb
RUNTEST = $(RUNTEST_PREFIX)runstdtest
-HAPPY = @HappyCmd@
-HAPPY_VERSION = @HappyVersion@
LX = @LxCmd@
GREENCARD = $(FPTOOLS_TOP)/green-card/src/green-card
BLD_DLL = dllwrap
#
LX = @LxCmd@
GREENCARD = $(FPTOOLS_TOP)/green-card/src/green-card
BLD_DLL = dllwrap
#
+# Happy
+#
+HAPPY = @HappyCmd@
+HAPPY_VERSION = @HappyVersion@
+#
+# Options to pass to Happy when we're going to compile the output with GHC
+#
+GHC_HAPPY_OPTS = $(shell if expr $(HAPPY_VERSION) \< "1.8" >/dev/null; then echo -g; else echo -agc; fi)
+
+#
# Stuff from fptools/literate
#
LIT2PGM = $(LITERATE_PREFIX)lit2pgm
# Stuff from fptools/literate
#
LIT2PGM = $(LITERATE_PREFIX)lit2pgm
@@
-688,10
+707,9
@@
LIT2TEXT = $(LITERATE_PREFIX)lit2text
#
# Stuff from fptools/ghc/utils
#
#
# Stuff from fptools/ghc/utils
#
-UNLIT = $(UNLIT_PREFIX)unlit
-UGEN = $(UGEN_PREFIX)ugen
+UNLIT = $(UNLIT_PREFIX)unlit$(EXE_SUFFIX)
STAT2RESID = $(STAT2RESID_PREFIX)stat2resid
STAT2RESID = $(STAT2RESID_PREFIX)stat2resid
-HP2PS = $(HP2PS_PREFIX)hp2ps
+HP2PS = $(HP2PS_PREFIX)hp2ps$(EXE_SUFFIX)
HSCPP = $(HSCPP_PREFIX)hscpp
HSTAGS = $(HSTAGS_PREFIX)hstags
HSCPP = $(HSCPP_PREFIX)hscpp
HSTAGS = $(HSTAGS_PREFIX)hstags