X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=374bd53407429c168747f6e1d8db61a35e29834c;hb=2e91abc1f5927bb7eb8b027549ecab5d54b6c48e;hp=dd11adf4c9ea388323a2586e9207636c66e4b847;hpb=8f95c6c82b6aa365d940d2a96df9cc672c1fedb1;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index dd11adf..374bd53 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -865,6 +865,7 @@ $(eval $(call bindist,.,\
 	$(BINDIST_EXTRAS) \
 	$(includes_H_CONFIG) \
 	$(includes_H_PLATFORM) \
+    $(includes_H_FILES) \
 	includes/ghcconfig.h \
 	includes/rts/Config.h \
     $(INSTALL_HEADERS) \
@@ -893,8 +894,8 @@ endif
 BIN_DIST_MK = $(BIN_DIST_PREP_DIR)/bindist.mk
 
 unix-binary-dist-prep:
-	"$(RM)" $(RM_OPTS) -r bindistprep/*
-	mkdir $(BIN_DIST_PREP_DIR)
+	"$(RM)" $(RM_OPTS) -r bindistprep/
+	"$(MKDIRHIER)" $(BIN_DIST_PREP_DIR)
 	set -e; for i in LICENSE compiler ghc rts libraries utils docs libffi includes driver mk rules Makefile aclocal.m4 config.sub config.guess install-sh extra-gcc-opts.in ghc.mk inplace; do ln -s ../../$$i $(BIN_DIST_PREP_DIR)/; done
 	echo "HADDOCK_DOCS       = $(HADDOCK_DOCS)"       >> $(BIN_DIST_MK)
 	echo "LATEX_DOCS         = $(LATEX_DOCS)"         >> $(BIN_DIST_MK)
@@ -909,12 +910,12 @@ unix-binary-dist-prep:
 	cd bindistprep && "$(TAR)" hcf - -T ../$(BIN_DIST_LIST) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
 
 windows-binary-dist-prep:
-	"$(RM)" $(RM_OPTS) -r bindistprep/*
+	"$(RM)" $(RM_OPTS) -r bindistprep/
 	$(MAKE) prefix=$(TOP)/$(BIN_DIST_PREP_DIR) install
 	cd bindistprep && "$(TAR)" cf - $(BIN_DIST_NAME) | bzip2 -c > ../$(BIN_DIST_PREP_TAR_BZ2)
 
 windows-installer:
-	"$(ISCC)" /O. /F$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
+	"$(ISCC)" /O. /Fbindistprep/$(WINDOWS_INSTALLER_BASE) - < distrib/ghc.iss
 
 nTimes = set -e; for i in `seq 1 $(1)`; do echo Try "$$i: $(2)"; if $(2); then break; fi; done
 
@@ -1070,6 +1071,11 @@ $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),\
   $(eval $(call clean-target,libraries/$(lib),dist-install,libraries/$(lib)/dist-install)))
 endif
 
+clean : clean_bindistprep
+.PHONY: clean_bindistprep
+clean_bindistprep:
+	"$(RM)" $(RM_OPTS) -r bindistprep/
+
 distclean : clean
 	"$(RM)" $(RM_OPTS) config.cache config.status config.log mk/config.h mk/stamp-h
 	"$(RM)" $(RM_OPTS) mk/config.mk mk/are-validating.mk mk/project.mk