[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 0eec930..25c7e32 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -492,10 +492,8 @@ HAPPY_PREFIX       = $(FPTOOLS_TOP)/happy/src/
 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/
-HSCPP_PREFIX            = $(FPTOOLS_TOP)/ghc/utils/hscpp/
 HSTAGS_PREFIX           = $(FPTOOLS_TOP)/ghc/utils/hstags/
 
 
@@ -631,7 +629,7 @@ ZIP                 = zip
 #
 # Under Windows, we have to deal with .exe suffixes
 #
-EXE_SUFFIX=@ExeSuffix@
+EXE_SUFFIX=@exeext@
 
 #
 # This is special to literate/, ToDo: add literate-specific
@@ -681,14 +679,22 @@ ETAGS                     = $(ETAGS_PREFIX)etags
 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
 
 #
+# 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
@@ -701,10 +707,9 @@ LIT2TEXT           = $(LITERATE_PREFIX)lit2text
 #
 # Stuff from fptools/ghc/utils
 #
-UNLIT                  = $(UNLIT_PREFIX)unlit
-UGEN                   = $(UGEN_PREFIX)ugen
+UNLIT                  = $(UNLIT_PREFIX)unlit$(EXE_SUFFIX)
 STAT2RESID             = $(STAT2RESID_PREFIX)stat2resid
-HP2PS                  = $(HP2PS_PREFIX)hp2ps
+HP2PS                  = $(HP2PS_PREFIX)hp2ps$(EXE_SUFFIX)
 HSCPP                  = $(HSCPP_PREFIX)hscpp
 HSTAGS                 = $(HSTAGS_PREFIX)hstags