X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=93ee7bc7d18af4a9bdb1f4e968135cbb67eaf46d;hp=4e5fcbb002324a4042204fdd68b87263ec0f8a0d;hb=e55d6fa8fcab24a7a072688a19b2e68e09c7f585;hpb=ac44fa5fba7ac748d0a123df1d32c7461589c110

diff --git a/Makefile b/Makefile
index 4e5fcbb..93ee7bc 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ endif
 include mk/custom-settings.mk
 
 # No need to update makefiles for these targets:
-REALGOALS=$(filter-out binary-dist bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show help,$(MAKECMDGOALS))
+REALGOALS=$(filter-out binary-dist binary-dist-prep bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show help install-docs test fulltest,$(MAKECMDGOALS))
 
 # configure touches certain files even if they haven't changed.  This
 # can mean a lot of unnecessary recompilation after a re-configure, so
@@ -77,14 +77,20 @@ endif
 	@echo "===--- finished updating makefiles"
 	$(MAKE) -r --no-print-directory -f ghc.mk $@
 
-binary-dist:
+binary-dist: binary-dist-prep
 ifeq "$(mingw32_TARGET_OS)" "1"
-	$(MAKE) -r --no-print-directory -f ghc.mk windows-binary-dist
+	mv bindistprep/*.exe .
+endif
+	mv bindistprep/*.tar.bz2 .
+
+binary-dist-prep:
+ifeq "$(mingw32_TARGET_OS)" "1"
+	$(MAKE) -r --no-print-directory -f ghc.mk windows-binary-dist-prep
 	$(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
+	$(MAKE) -r --no-print-directory -f ghc.mk unix-binary-dist-prep
 endif
 
 clean distclean maintainer-clean:
@@ -102,8 +108,23 @@ framework-pkg:
 	$(MAKE) -C distrib/MacOS $@
 endif
 
+# install-docs is a historical target that isn't supported in GHC 6.12. See #3662.
+install-docs:
+	@echo "The install-docs target is not supported in GHC 6.12.1 and later."
+	@echo "'make install' now installs everything, including documentation."
+	@exit 1
+
 # If the user says 'make A B', then we don't want to invoke two
 # instances of the rule above in parallel:
 .NOTPARALLEL:
 
 endif
+
+.PHONY: test
+test:
+	$(MAKE) -C testsuite/tests/ghc-regress CLEANUP=1 OUTPUT_SUMMARY=../../../testsuite_summary.txt fast
+
+.PHONY: fulltest
+fulltest:
+	$(MAKE) -C testsuite/tests/ghc-regress CLEANUP=1 OUTPUT_SUMMARY=../../../testsuite_summary.txt
+