X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=7792b5abc04e66e4555b183e1e037e2053731860;hb=0be79fa683f2caabb7c3a853f1f893e57e4abd34;hp=a65e2345841526f14f2f71227ebbb4d29a7e26be;hpb=6f2c43b99042da466b309c914377bd4e33b65cb8;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index a65e234..7792b5a 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -741,7 +741,7 @@ install_docs: $(INSTALL_HEADERS)
 	$(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`; \
@@ -771,17 +771,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 \
@@ -800,6 +801,8 @@ $(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/) \