X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=de18a692365a4a4437a52b8dbe72adb67d2d207a;hb=d4f9480c7e7bf8167a97ff964f9d85400398c5c4;hp=0741b563068c305bfe5bfa803bae4f4d95550cd4;hpb=430cdb1310a82a7112c00a5f5af2f503d27f0684;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 0741b56..de18a69 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -140,6 +140,9 @@ endif
 include rules/all-target.mk
 include rules/clean-target.mk
 
+# Helper macro
+include rules/mkdep.mk
+
 # -----------------------------------------------------------------------------
 # The inplace tree
 
@@ -594,6 +597,10 @@ libraries/index.html: $(ALL_HADDOCK_FILES)
 $(eval $(call all-target,library_doc_index,libraries/index.html))
 INSTALL_LIBRARY_DOCS += libraries/*.html libraries/*.gif libraries/*.css libraries/*.js
 
+ifeq "$(CHECK_PACKAGES)" "YES"
+all: check_packages
+endif
+
 # -----------------------------------------------------------------------------
 # Bootstrapping libraries
 
@@ -736,8 +743,9 @@ install_docs: $(INSTALL_HEADERS)
 		$(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir); \
 	done
 	$(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html; \
+	$(INSTALL_DOC) $(INSTALL_OPTS) docs/index.html $(DESTDIR)$(docdir)/html; \
 	for i in $(INSTALL_LIBRARY_DOCS); do \
-		$(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/libraries/; \
+		$(INSTALL_DOC) $(INSTALL_OPTS) $$i $(DESTDIR)$(docdir)/html/libraries/; \
 	done
 	for i in $(INSTALL_HTML_DOC_DIRS); do \
 		$(INSTALL_DIR) $(INSTALL_OPTS) $(DESTDIR)$(docdir)/html/`basename $$i`; \
@@ -767,17 +775,18 @@ install_packages: libffi/package.conf.install rts/package.conf.install
 		 $(INSTALLED_GHC_PKG_REAL) \
 		 $(INSTALLED_PACKAGE_CONF) \
 		 libraries/$p dist-install \
-		 '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/libraries' &&) true
+		 '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/html/libraries' &&) true
 	"$(GHC_CABAL_INPLACE)" install \
 	 	 $(INSTALLED_GHC_PKG_REAL) \
 		 $(INSTALLED_PACKAGE_CONF) \
 		 compiler stage2 \
-		 '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/libraries'
+		 '$(DESTDIR)' '$(prefix)' '$(libdir)' '$(docdir)/html/libraries'
 
 # -----------------------------------------------------------------------------
 # Binary distributions
 
-$(eval $(call bindist,.,\
+# This is split in 2 because of the shell argument limit
+$(eval $(call bindist,root1,\
     LICENSE \
     configure config.sub config.guess install-sh \
     extra-gcc-opts.in \
@@ -796,7 +805,10 @@ $(eval $(call bindist,.,\
     $(INSTALL_BINS) \
     $(INSTALL_DOCS) \
     $(INSTALL_LIBRARY_DOCS) \
+ ))
+$(eval $(call bindist,root2,\
     $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \
+	docs/index.html \
 	$(wildcard libraries/*/dist-install/doc/) \
     $(filter-out extra-gcc-opts,$(INSTALL_LIBS)) \
     $(filter-out %/project.mk,$(filter-out mk/config.mk,$(MAKEFILE_LIST))) \