[project @ 2000-10-03 09:56:58 by rrt]

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

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 25c7e32..fc7908c 100644 (file)
--- 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.
 
@@ -520,9 +529,11 @@ MKDEPENDHS = $(HC)
 
 # Sometimes we want to invoke ghc from the build tree in different
 # projects (eg. it's handy to have a nofib & a ghc build in the same
-# tree).  We can refer to "this ghc" as $(GHC_INPLACE):
+# tree).  We can refer to "this ghc" as $(GHC_INPLACE).
+# The addition to PATH makes the inplace GHC pick up the right
+# DLLs under Windows; it won't have any effect on other platforms.
 
-GHC_INPLACE    = $(FPTOOLS_TOP)/ghc/driver/ghc-inplace
+GHC_INPLACE    = PATH=$(FPTOOLS_TOP)/dll:$$PATH $(FPTOOLS_TOP)/ghc/driver/ghc-inplace
 
 #-----------------------------------------------------------------------------
 # C compiler
@@ -786,7 +797,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: