X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=f1435358412f7016d66cf7e276dc648bdf6ea00c;hp=e00a8445085c57d9a09e0ad8bf8a706f8c47ea21;hb=622e67a80631c7528ebfa51e9a863c27e74f1c6b;hpb=610379bc0660cc9df6bb8cfaa98e566157236026

diff --git a/Makefile b/Makefile
index e00a844..f143535 100644
--- a/Makefile
+++ b/Makefile
@@ -223,10 +223,6 @@ BinDistLinks = ghc ghci ghc-pkg
 BinDistLibSplicedFiles = package.conf
 BinDistDirs = includes compiler docs driver rts utils
 
-BIN_DIST_NAME=ghc-$(ProjectVersion)
-BIN_DIST_TOPDIR=$(FPTOOLS_TOP_ABS)
-BIN_DIST_DIR=$(BIN_DIST_TOPDIR)/$(BIN_DIST_NAME)
-
 BIN_DIST_TARBALL=ghc-$(ProjectVersion)-$(TARGETPLATFORM).tar.bz2
 
 BIN_DIST_TOP= distrib/Makefile \
@@ -332,6 +328,7 @@ binary-dist :: $(BINARY_DIST_DOC_RULES)
 $(BINARY_DIST_DOC_RULES): binary-dist-doc-%:
 	$(MAKE) -C $* $(MFLAGS) $(BINDIST_DOC_WAYS)
 	$(MAKE) -C $* $(MFLAGS) install-docs \
+			MAKING_BIN_DIST=1 \
 	        XMLDocWays="$(BINDIST_DOC_WAYS)" \
 	        prefix=$(BIN_DIST_DIR) \
 	        exec_prefix=$(BIN_DIST_DIR) \
@@ -372,27 +369,8 @@ endif
 
 .PHONY: binary-dist-doc-%
 
-BIN_DIST_LIBDIR=$(BIN_DIST_DIR)/libraries
-
-LIBRARY_SUBDIRS=$(shell $(MAKE) -s -C libraries subdirs)
-
-BINARY_DIST_LIBRARY_RULES=$(foreach d,$(LIBRARY_SUBDIRS),binary-dist-lib-$d)
-
-binary-dist:: $(BINARY_DIST_LIBRARY_RULES)
-	cp    libraries/Makefile           $(BIN_DIST_LIBDIR)
-	cp    libraries/gen_contents_index $(BIN_DIST_LIBDIR)
-	cp    libraries/index.html         $(BIN_DIST_LIBDIR)
-	cp    libraries/doc-index.html     $(BIN_DIST_LIBDIR)
-	cp -a libraries/stamp              $(BIN_DIST_LIBDIR)
-
-$(BINARY_DIST_LIBRARY_RULES): binary-dist-lib-%:
-	$(MKDIRHIER) $(BIN_DIST_LIBDIR)/$*/setup
-	cp    libraries/$*/setup/Setup   $(BIN_DIST_LIBDIR)/$*/setup
-	cp    libraries/$*/*.cabal       $(BIN_DIST_LIBDIR)/$*
-	cp -a libraries/$*/dist          $(BIN_DIST_LIBDIR)/$*
-	find $(BIN_DIST_LIBDIR)/$*/dist \
-	     \( \( -name "*.o" -o -name "*.p_o" \) -a \! -name "HS*" \) \
-	     -exec rm {} \;
+binary-dist::
+	$(MAKE) -C libraries binary-dist
 
 # Jiggle the files around to make a valid Windows distribution if necessary
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
@@ -419,7 +397,7 @@ endif
 publish-binary-dist :
 	@for i in 0 1 2 3 4 5 6 7 8 9; do \
 		echo "Try $$i: $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation)"; \
-		if $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation); then break; fi\
+		if $(PublishCp) $(BIN_DIST_TARBALL) $(PublishLocation); then break; fi; \
 	done
 	$(PublishCp) -r $(BIN_DIST_DIR)/share/html/* $(PublishLocation)/docs