X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=7acb3a2e72c084adae94831391bb4c3c191017d3;hb=e542d75c0a4b529aeafc0fc51038d670a8adc74c;hp=32fb196eaa03e6dc667337ad8ce29376b0154cbe;hpb=e946a8b1020e9a0e75bba33c64739c93c65c1424;p=ghc-hetmet.git

diff --git a/mk/config.mk.in b/mk/config.mk.in
index 32fb196..7acb3a2 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -272,9 +272,6 @@ GhcThreaded = $(if $(findstring thr,$(GhcRTSWays)),YES,NO)
 
 GhcLibHcOpts=-O2 -XGenerics
 
-# Win32 only: Enable the RTS and libraries to be built as DLLs
-DLLized=@EnableWin32DLLs@
-
 # Strip local symbols from libraries?  This can make the libraries smaller,
 # but makes debugging somewhat more difficult.  Doesn't work with all ld's.
 #
@@ -361,12 +358,12 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 DEFAULT_TMPDIR		= /C/TEMP
 endif
 
-BIN_DIST_DIR=bindistprep/$(BIN_DIST_NAME)
-
-BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TAR=$(TOP)/bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar
-BIN_DIST_TAR_BZ2=$(BIN_DIST_TAR).bz2
-BIN_DIST_LIST=$(TOP)/bindist-list
+BIN_DIST_NAME         = ghc-$(ProjectVersion)
+BIN_DIST_PREP_DIR     = bindistprep/$(BIN_DIST_NAME)
+BIN_DIST_PREP_TAR     = bindistprep/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar
+BIN_DIST_PREP_TAR_BZ2 = $(BIN_DIST_PREP_TAR).bz2
+BIN_DIST_TAR_BZ2      = $(BIN_DIST_NAME)-$(TARGETPLATFORM).tar.bz2
+BIN_DIST_LIST         = bindist-list
 
 WINDOWS_INSTALLER_BASE = ghc-$(ProjectVersion)-i386-windows
 WINDOWS_INSTALLER = $(WINDOWS_INSTALLER_BASE)$(exeext)
@@ -606,7 +603,8 @@ RANLIB			= @RANLIB@
 SED			= @SedCmd@
 SHELL			= /bin/sh
 
-LD			= @LdCmd@
+LD = @LdCmd@
+NM = @NmCmd@
 
 # Some ld's support the -x flag and some don't, so the configure
 # script detects which we have and sets LdXFlag to "-x" or ""