X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=ec0c901bfe412c7441b192418ba534e4b70bbe06;hb=9b70ae2db513be48a1c07bad7ee52ebb4b39132e;hp=dbb4dfe3a5a04540677f4d09d08b83862dd1f9b9;hpb=094f9feafaf83190891736ddd8d1d7213f4293c4;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index dbb4dfe..ec0c901 100644
--- a/Makefile
+++ b/Makefile
@@ -211,10 +211,24 @@ install-docs ::
 #	binary-dist is a GHC addition for binary distributions
 # 
 
-BinDistDirs = includes compiler docs rts
-
 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"
+
+binary-dist::
+	$(MAKE) prefix=$(BIN_DIST_DIR) install
+
+binary-dist::
+	cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
+
+else
+
+BinDistDirs = includes compiler docs rts
+
 BIN_DIST_TOP= distrib/Makefile \
               distrib/configure-bin.ac \
               distrib/INSTALL \
@@ -235,8 +249,6 @@ endif
 binary-dist:: binary-dist-pre
 
 binary-dist-pre::
-	-rm -rf $(BIN_DIST_DIR)
-	-$(RM) $(BIN_DIST_DIR).tar.gz
 	$(MKDIRHIER) $(BIN_DIST_DIR)/mk
 	echo 'include $$(TOP)/Makefile-vars' >  $(BIN_DIST_DIR)/mk/boilerplate.mk
 	echo 'include $$(TOP)/mk/install.mk' >  $(BIN_DIST_DIR)/mk/target.mk
@@ -272,6 +284,9 @@ binary-dist::
 	echo "ProjectVersion = $(ProjectVersion)"                    >> $(VARFILE)
 	echo "HaveLibGmp = $(HaveLibGmp)"                            >> $(VARFILE)
 	echo "GhcLibsWithUnix = $(GhcLibsWithUnix)"                  >> $(VARFILE)
+	echo "GhcWithInterpreter = $(GhcWithInterpreter)"            >> $(VARFILE)
+	echo "GhcHasReadline = $(GhcHasReadline)"                    >> $(VARFILE)
+	echo "BootingFromHc = $(BootingFromHc)"                      >> $(VARFILE)
 	cat distrib/Makefile-bin-vars.in                             >> $(VARFILE)
 	@echo "Generating a shippable configure script.."
 	$(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
@@ -341,16 +356,10 @@ endif
 binary-dist::
 	$(MAKE) -C libraries binary-dist
 
-# Jiggle the files around to make a valid Windows distribution if necessary
-ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
-binary-dist :: fiddle-binary-dist
 endif
 
-.PHONY: fiddle-binary-dist
-fiddle-binary-dist:
-	cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
 # Tar up the distribution and build a manifest
-# XXX binary-dist :: tar-binary-dist
+binary-dist :: tar-binary-dist
 
 .PHONY: tar-binary-dist
 tar-binary-dist: