X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=b8c108946986ac88c543b94b443b1e3e8fa61193;hb=affbe8dae5d7eb350686b42ddbd4f3561b7bd0ec;hp=2ab4d5e4030f6a33facd4807f8ddefd5e21eadbf;hpb=f6b7966af9e0db74a27569849fc3e5f25dc3dbe8;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 2ab4d5e..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,6 +214,12 @@ install-docs ::
 #	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"
 
 binary-dist::
@@ -223,8 +232,6 @@ else
 
 BinDistDirs = includes compiler docs rts
 
-BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
-
 BIN_DIST_TOP= distrib/Makefile \
               distrib/configure-bin.ac \
               distrib/INSTALL \
@@ -245,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
@@ -282,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
@@ -366,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)