X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=0e2896a2fb489493c736b8607699b694ffa748be;hb=5a5747202b4fb5c42bdc1ebcacb9f9b7bf87cdc7;hp=ff3cc61428e2b8b005c742d78a6e0aeb7b6b6b1a;hpb=0a0fa7895b411d066bd51b27626314b8354af9ec;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index ff3cc61..0e2896a 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -365,7 +365,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 +497,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 +634,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
@@ -788,7 +791,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: