X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=9ce17a3b83f3285ed0ba4cbb8e56b64c1a59720b;hb=87787d75998c8864109b76c34d55e36e55c26e74;hp=066d1b686acee84a87a2d2b94e95dd2810a2cbb6;hpb=cb913bbf1f66a6ee01f01b63a3d583abf7609823;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 066d1b6..9ce17a3 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -777,8 +777,10 @@ INSTALLED_PACKAGE_CONF=$(DESTDIR)$(topdir)/package.conf
 # Install packages in the right order, so that ghc-pkg doesn't complain.
 # Also, install ghc-pkg first.
 ifeq "$(Windows)" "NO"
+INSTALLED_GHC_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-stage2
 INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(ghclibexecdir)/ghc-pkg
 else
+INSTALLED_GHC_REAL=$(DESTDIR)$(bindir)/ghc-stage2.exe
 INSTALLED_GHC_PKG_REAL=$(DESTDIR)$(bindir)/ghc-pkg.exe
 endif
 
@@ -792,21 +794,22 @@ install_packages: libffi/package.conf.install rts/package.conf.install
 	"$(INSTALLED_GHC_PKG_REAL)" --force --global-conf $(INSTALLED_PACKAGE_CONF) update rts/package.conf.install
 	$(foreach p, $(PACKAGES) $(PACKAGES_STAGE2),\
 	    "$(GHC_CABAL_INPLACE)" install \
+		 $(INSTALLED_GHC_REAL) \
 		 $(INSTALLED_GHC_PKG_REAL) \
-		 $(INSTALLED_PACKAGE_CONF) \
+		 $(DESTDIR)$(topdir) \
 		 libraries/$p dist-install \
 		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries' &&) true
 	"$(GHC_CABAL_INPLACE)" install \
+		 $(INSTALLED_GHC_REAL) \
 	 	 $(INSTALLED_GHC_PKG_REAL) \
-		 $(INSTALLED_PACKAGE_CONF) \
+		 $(DESTDIR)$(topdir) \
 		 compiler stage2 \
 		 '$(DESTDIR)' '$(prefix)' '$(ghclibdir)' '$(docdir)/html/libraries'
 
 # -----------------------------------------------------------------------------
 # Binary distributions
 
-# This is split in 2 because of the shell argument limit
-$(eval $(call bindist,root1,\
+$(eval $(call bindist,.,\
     LICENSE \
     configure config.sub config.guess install-sh \
     extra-gcc-opts.in \
@@ -827,8 +830,6 @@ $(eval $(call bindist,root1,\
     $(INSTALL_BINS) \
     $(INSTALL_DOCS) \
     $(INSTALL_LIBRARY_DOCS) \
- ))
-$(eval $(call bindist,root2,\
     $(addsuffix /*,$(INSTALL_HTML_DOC_DIRS)) \
 	docs/index.html \
 	$(wildcard libraries/*/dist-install/doc/) \