X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=Makefile;h=519899e1876eff45c22a5c78e80f90160f124108;hp=c079170bb48912dab12dacb6fd5a54f5d9bac935;hb=aafdba3bce91afb003f5f50e001e141744837bae;hpb=7fa5c11df9430fc35645bd7e74ad0f284e783d82

diff --git a/Makefile b/Makefile
index c079170..519899e 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.
@@ -252,6 +252,7 @@ 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 +303,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,6 +330,8 @@ 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)
 
@@ -419,7 +421,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 \
@@ -456,7 +458,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 \
 	)