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

diff --git a/Makefile b/Makefile
index dbb4dfe..b8c1089 100644
--- a/Makefile
+++ b/Makefile
@@ -64,6 +64,9 @@ else
 SUBDIRS_BUILD = includes compat utils driver docs compiler rts
 endif
 
+# Needed for, e.g., clean
+SUBDIRS = $(SUBDIRS_BUILD)
+
 SUBDIRS_INSTALL = includes compat utils driver docs rts libraries compiler
 
 # Sanity check that all the core libraries are in the tree, to catch
@@ -211,10 +214,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 +252,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 +287,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 +359,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:
@@ -362,7 +374,7 @@ PUBLISH_FILES = $(BIN_DIST_TARBALL)
 # Upload the distribution and documentation
 ifneq "$(ISCC)" ""
 WINDOWS_INSTALLER_BASE = ghc-$(ProjectVersion)-$(TARGETPLATFORM)
-WINDOWS_INSTALLER = $(WINDOWS_INSTALLER)$(exeext)
+WINDOWS_INSTALLER = $(WINDOWS_INSTALLER_BASE)$(exeext)
 
 PUBLISH_FILES += $(WINDOWS_INSTALLER)