fix typo

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index ed2d92a..3928a6b 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -35,7 +35,8 @@ default_target: all
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = base containers bytestring old-locale old-time filepath directory
+SUBDIRS  = base array packedstring containers bytestring
+SUBDIRS += old-locale old-time filepath directory
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
 endif
@@ -286,7 +287,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
        $(RM) -rf bootstrapping.*
        $(RM) -rf ifBuildable
        $(RM) -rf installPackage
-       $(RM) -f libraries.txt index.html doc-index.html
+       $(RM) -f libraries.txt index.html doc-index.html doc-index-*.html
 
 $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR)): \
 clean.library.%:
@@ -322,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.%
@@ -346,8 +347,8 @@ binary-dist.library.%:
        if ifBuildable/ifBuildable $*; then \
          cd $* && \
          cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \
+         cp    LICENSE       $(BIN_DIST_LIBDIR)/$* && \
          cp -a dist          $(BIN_DIST_LIBDIR)/$* && \
-       # Euch \
          (cp -aL include      $(BIN_DIST_LIBDIR)/$* || :) && \
          $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
             \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \