X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=69c419c47d8ad79a12d0892049e9f5b2b7fa50fd;hb=b410846772e0ee630b82df31990bf9805b2d1849;hp=ec55261be1d898dd45c18b47856c5f953b1bc384;hpb=c19a1264a58ad4cfcf61be4b728eaf64fc248cfe;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index ec55261..69c419c 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,11 @@ else
 default : all
 	@:
 
+# For help, type 'make help'
+.PHONY: help
+help :
+	@cat MAKEHELP
+
 ifneq "$(findstring clean,$(MAKECMDGOALS))" ""
 -include mk/config.mk
 else
@@ -43,17 +48,13 @@ endif
 
 include mk/custom-settings.mk
 
-PACKAGE_MK=libraries/base/ghc.mk
-$(PACKAGE_MK):
-	sh boot-pkgs
-
 # No need to update makefiles for these targets:
-REALGOALS=$(filter-out bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show,$(MAKECMDGOALS))
+REALGOALS=$(filter-out bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show help,$(MAKECMDGOALS))
 
 # NB. not the same as saying '%: ...', which doesn't do the right thing:
 # it does nothing if we specify a target that already exists.
 .PHONY: $(REALGOALS)
-$(REALGOALS) all: $(PACKAGE_MK)
+$(REALGOALS) all:
 	@echo "===--- updating makefiles phase 0"
 	$(MAKE) -r --no-print-directory -f ghc.mk phase=0 just-makefiles
 ifneq "$(OMIT_PHASE_1)" "YES"
@@ -72,9 +73,14 @@ endif
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
 binary-dist:
+ifeq "$(mingw32_TARGET_OS)" "1"
+	$(MAKE) -r --no-print-directory -f ghc.mk windows-binary-dist
+	$(MAKE) -r --no-print-directory -f ghc.mk windows-installer
+else
 	rm -f bindist-list
 	$(MAKE) -r --no-print-directory -f ghc.mk bindist BINDIST=YES
 	$(MAKE) -r --no-print-directory -f ghc.mk binary-dist
+endif
 
 clean distclean maintainer-clean:
 	$(MAKE) -r --no-print-directory -f ghc.mk $@ CLEANING=YES
@@ -83,7 +89,7 @@ clean distclean maintainer-clean:
 $(filter clean_%, $(MAKECMDGOALS)) : clean_% :
 	$(MAKE) -r --no-print-directory -f ghc.mk $@ CLEANING=YES
 
-bootstrapping-files show: $(PACKAGE_MK)
+bootstrapping-files show:
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
 ifeq "$(darwin_TARGET_OS)" "1"