X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=de5ee8a6514c3cb2441c36cf7fa7e710d78b9567;hp=94d6df8ad7be18be4098753cae05adceeacdfff4;hb=d8b99b7e9b2ce9fd8ba97fa10657082ceac09c59;hpb=57605cf459c2670566bd6e9b1744ef663d05384b

diff --git a/Makefile b/Makefile
index 94d6df8..de5ee8a 100644
--- a/Makefile
+++ b/Makefile
@@ -19,13 +19,9 @@ default:
 	@echo 'Run "make install" to install'
 	@false
 
-.PHONY: install
-install:
-	$(MAKE) -r --no-print-directory -f ghc.mk install BINDIST=YES NO_INCLUDE_DEPS=YES
-
-.PHONY: show
-show:
-	$(MAKE) -r --no-print-directory -f ghc.mk $@
+.PHONY: install show
+install show:
+	$(MAKE) -r --no-print-directory -f ghc.mk $@ BINDIST=YES NO_INCLUDE_DEPS=YES
 
 else
 
@@ -49,7 +45,7 @@ endif
 include mk/custom-settings.mk
 
 # No need to update makefiles for these targets:
-REALGOALS=$(filter-out 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,$(MAKECMDGOALS))
 
 # configure touches certain files even if they haven't changed.  This
 # can mean a lot of unnecessary recompilation after a re-configure, so
@@ -81,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"
+	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
+	$(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:
@@ -106,6 +108,12 @@ 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: