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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 7647f26..3dcfcc0 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -285,6 +285,10 @@ LibsReadline=@LibsReadline@
 #
 ReadlineIncludePath=
 
+# Build the Haskell OpenGL/GLUT binding?
+#
+GhcLibsWithHOpenGL=@GhcLibsWithHOpenGL@
+
 ################################################################################
 #
 #		happy project
@@ -365,7 +369,12 @@ NoFibHcOpts = -O
 # this in build.mk or set your environment variable "TMPDIR" to point
 # to somewhere with more space.  (TMPDIR=. is a good choice).
 
-TMPDIR			= /tmp
+# DEFAULT_TMPDIR isn't called TMPDIR because GNU make tends to
+# override the environment variable with the value of the make
+# variable when executing sub-processes, so setting the TMPDIR env var
+# would have no effect in the build tree.
+
+DEFAULT_TMPDIR		= /tmp
 
 # FPTOOLS_TOP: the top of the fptools hierarchy, absolute path.
 
@@ -492,10 +501,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/
 
 
@@ -509,6 +516,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@
 
@@ -626,7 +638,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
@@ -676,14 +688,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
@@ -696,10 +716,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
 
@@ -776,7 +795,7 @@ WAY_mg_HC_OPTS=-gransim
 
 # Way `dll': 
 WAY_dll_NAME=Win32 DLLs
-WAY_dll_HC_OPTS=
+WAY_dll_HC_OPTS=-dll
 
 #
 # Add user-way configurations here: