X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=41e09dd60765e17433ae2064aebd1a76285dff6a;hp=000bfa0b8f3d16734cf53d77981084bb0621d7bc;hb=b6d08641e2757898470a10dfa906084ade8ab835;hpb=bcd95f911539fd5308bec5a025bcadba712a3830

diff --git a/Makefile b/Makefile
index 000bfa0..41e09dd 100644
--- a/Makefile
+++ b/Makefile
@@ -61,10 +61,10 @@ include $(TOP)/mk/boilerplate.mk
 ifeq "$(BootingFromHc)" "YES"
 SUBDIRS_BUILD = gmp includes rts compat compiler docs utils driver
 else
-SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts
+SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts libraries/Cabal/doc
 endif
 
-SUBDIRS = gmp includes compat utils driver docs rts libraries compiler
+SUBDIRS = gmp includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
 
 # Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
@@ -162,6 +162,9 @@ else
 INSTALL_STAGE =
 endif
 
+install-strip:
+	$(MAKE) INSTALL_PROGRAM='$(INSTALL_PROGRAM) -s' install
+
 # Same as default rule, but we pass $(INSTALL_STAGE) to $(MAKE) too
 install :: check-packages
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
@@ -248,10 +251,21 @@ binary-dist::
 	-rm -rf $(BIN_DIST_DIR)
 	-$(RM) $(BIN_DIST_DIR).tar.gz
 
+# When making bindists, we can have problems if some things (e.g. ghc-pkg)
+# are compiled with the bootstrapping compiler and some (e.g. the stage 2
+# compiler) with the stage1 compiler. See #1860 for an example.
+# Thus we rebuild the utils with stage 1 here. This is a bit unpleasant,
+# as binary-dist really shouldn't actually build anything, but it works.
+binary-dist::
+	$(MAKE) -C utils clean
+	$(MAKE) -C utils UseStage1=YES boot
+	$(MAKE) -C utils UseStage1=YES
+
 ifeq "$(TARGETPLATFORM)" "i386-unknown-mingw32"
 
 binary-dist::
 	$(MAKE) prefix=$(BIN_DIST_DIR) install
+	$(MAKE) prefix=$(BIN_DIST_DIR) install-docs
 
 binary-dist::
 	cd $(BIN_DIST_DIR) && ../distrib/prep-bin-dist-mingw
@@ -302,13 +316,12 @@ binary-dist::
 	$(MAKE) -C gmp       binary-dist DOING_BIN_DIST=YES
 	$(MAKE) -C includes  binary-dist DOING_BIN_DIST=YES
 	$(MAKE) -C compiler  binary-dist DOING_BIN_DIST=YES $(INSTALL_STAGE)
-	# Setting _way here is a nasty hack to make sure we get
-	# libHSrts*.a etc rather than just libHSrts.a
-	$(MAKE) -C rts       binary-dist DOING_BIN_DIST=YES _way='*'
+	$(MAKE) -C rts       binary-dist DOING_BIN_DIST=YES
 	$(MAKE) -C driver    binary-dist DOING_BIN_DIST=YES
 	$(MAKE) -C utils     binary-dist DOING_BIN_DIST=YES
 	$(MAKE) -C docs      binary-dist DOING_BIN_DIST=YES
 	$(MAKE) -C libraries binary-dist DOING_BIN_DIST=YES
+	$(MAKE) -C libraries/Cabal/doc binary-dist DOING_BIN_DIST=YES
 
 VARFILE=$(BIN_DIST_DIR)/Makefile-vars.in
 
@@ -330,7 +343,11 @@ binary-dist::
 	echo "GhcHasReadline = $(GhcHasReadline)"                    >> $(VARFILE)
 	echo "BootingFromHc = $(BootingFromHc)"                      >> $(VARFILE)
 	echo "XMLDocWays = $(XMLDocWays)"                            >> $(VARFILE)
+	# We won't actually use xsltproc, but we need to know if it's "" or not
+	echo "XSLTPROC = $(XSLTPROC)"                                >> $(VARFILE)
 	echo "TARGETPLATFORM = $(TARGETPLATFORM)"                    >> $(VARFILE)
+	echo "HADDOCK_DOCS = $(HADDOCK_DOCS)"                        >> $(VARFILE)
+
 	cat distrib/Makefile-bin-vars.in                             >> $(VARFILE)
 	@echo "Generating a shippable configure script.."
 	$(MV) $(BIN_DIST_DIR)/configure-bin.ac $(BIN_DIST_DIR)/configure.ac
@@ -417,7 +434,7 @@ SRC_DIST_DIR=$(shell pwd)/$(SRC_DIST_NAME)
 #
 # Files to include in source distributions
 #
-SRC_DIST_DIRS += mk docs distrib bindisttest $(filter-out docs distrib,$(SUBDIRS))
+SRC_DIST_DIRS += mk docs distrib bindisttest $(filter-out docs distrib libraries/Cabal/doc,$(SUBDIRS))
 SRC_DIST_FILES += \
 	configure.ac config.guess config.sub configure \
 	aclocal.m4 README ANNOUNCE HACKING LICENSE Makefile install-sh \
@@ -454,7 +471,7 @@ dist ::
 	  && for i in $(SRC_DIST_DIRS); do mkdir $$i; (cd $$i && lndir $(FPTOOLS_TOP_ABS)/$$i ); done \
 	  && for i in $(SRC_DIST_FILES); do $(LN_S) $(FPTOOLS_TOP_ABS)/$$i .; done \
 	  && $(MAKE) distclean \
-	  && if test -f $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; fi \
+	  && if test -f $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs; then $(CP) $(FPTOOLS_TOP_ABS)/libraries/haskell-src/dist/build/Language/Haskell/Parser.hs libraries/haskell-src/Language/Haskell/ ; mv libraries/haskell-src/Language/Haskell/Parser.ly libraries/haskell-src/Language/Haskell/Parser.ly.source ; fi \
 	  && $(RM) -rf compiler/stage[123] mk/build.mk \
 	  && $(FIND) $(SRC_DIST_DIRS) \( -name _darcs -o -name SRC -o -name "autom4te*" -o -name "*~" -o -name ".cvsignore" -o -name "\#*" -o -name ".\#*" -o -name "log" -o -name "*-SAVE" -o -name "*.orig" -o -name "*.rej" \) -print | xargs $(RM) -rf \
 	)