fix compiling GHC 6.7+ with itself - compat needs -package containers now

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index 35dc5b9..3928a6b 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -323,7 +323,7 @@ $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR)): \
 install.library.%: installPackage/installPackage ifBuildable/ifBuildable
        if ifBuildable/ifBuildable $*; then \
          cd $* && \
-         ../installPackage/installPackage $(prefix) $(bindir)/ghc-pkg; \
+         ../installPackage/installPackage $(DESTDIR)$(prefix) $(FPTOOLS_TOP_ABS)/$(GHC_PKG_DIR_REL)/ghc-pkg-inplace $(DESTDIR)$(libdir)/package.conf; \
        fi
 
 .PHONY: binary-dist binary-dist.library.%
@@ -347,6 +347,7 @@ binary-dist.library.%:
        if ifBuildable/ifBuildable $*; then \
          cd $* && \
          cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \
+         cp    LICENSE       $(BIN_DIST_LIBDIR)/$* && \
          cp -a dist          $(BIN_DIST_LIBDIR)/$* && \
          (cp -aL include      $(BIN_DIST_LIBDIR)/$* || :) && \
          $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \