X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=mk%2Fconfig.mk.in;h=09c8621df7ee6bd9de5f7e88d9072b13cd59a8dd;hb=da6b7fce09f98a0fbe66b6d218e6473c1845e354;hp=f660fc0915eabefa3b5d5800b247909843fe3227;hpb=c6660342270b6121242b77d09cdc38fa2f7f3103;p=ghc-hetmet.git diff --git a/mk/config.mk.in b/mk/config.mk.in index f660fc0..09c8621 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,15 +358,12 @@ ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" DEFAULT_TMPDIR = /C/TEMP endif -BIN_DIST_TOPDIR_ABS=$(TOP) -BIN_DIST_DIR=$(BIN_DIST_TOPDIR_ABS)/$(BIN_DIST_NAME) - -BIN_DIST_NAME=ghc-$(ProjectVersion) -BIN_DIST_TAR=$(TOP)/$(BIN_DIST_NAME)-$(TARGETPLATFORM).tar -BIN_DIST_TAR_BZ2=$(BIN_DIST_TAR).bz2 -BIN_DIST_PREP_DIR=$(TOP)/bindist-prep -BIN_DIST_PREP=$(BIN_DIST_PREP_DIR)/$(BIN_DIST_NAME) -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)