Commit 2506fbad authored by Ian Lynagh's avatar Ian Lynagh

Windows bindist tweaking

parent da6f42a2
...@@ -211,6 +211,12 @@ install-docs :: ...@@ -211,6 +211,12 @@ install-docs ::
# binary-dist is a GHC addition for binary distributions # binary-dist is a GHC addition for binary distributions
# #
BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
binary-dist::
-rm -rf $(BIN_DIST_DIR)
-$(RM) $(BIN_DIST_DIR).tar.gz
ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32" ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
binary-dist:: binary-dist::
...@@ -223,8 +229,6 @@ else ...@@ -223,8 +229,6 @@ else
BinDistDirs = includes compiler docs rts BinDistDirs = includes compiler docs rts
BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
BIN_DIST_TOP= distrib/Makefile \ BIN_DIST_TOP= distrib/Makefile \
distrib/configure-bin.ac \ distrib/configure-bin.ac \
distrib/INSTALL \ distrib/INSTALL \
...@@ -245,8 +249,6 @@ endif ...@@ -245,8 +249,6 @@ endif
binary-dist:: binary-dist-pre binary-dist:: binary-dist-pre
binary-dist-pre:: binary-dist-pre::
-rm -rf $(BIN_DIST_DIR)
-$(RM) $(BIN_DIST_DIR).tar.gz
$(MKDIRHIER) $(BIN_DIST_DIR)/mk $(MKDIRHIER) $(BIN_DIST_DIR)/mk
echo 'include $$(TOP)/Makefile-vars' > $(BIN_DIST_DIR)/mk/boilerplate.mk echo 'include $$(TOP)/Makefile-vars' > $(BIN_DIST_DIR)/mk/boilerplate.mk
echo 'include $$(TOP)/mk/install.mk' > $(BIN_DIST_DIR)/mk/target.mk echo 'include $$(TOP)/mk/install.mk' > $(BIN_DIST_DIR)/mk/target.mk
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment