X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=libraries%2FMakefile;h=3928a6b8ee6cad60c76e3a87a9bbc0fa7783bfc8;hb=7ef211e8d6aed14f77b344d976e207bc77e365a7;hp=ffb1a90968c8babe08984946ab6582b62294c312;hpb=7cf591f6971ba96d01ec4afc453fa4ac498d759a;p=ghc-hetmet.git

diff --git a/libraries/Makefile b/libraries/Makefile
index ffb1a90..3928a6b 100644
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -35,15 +35,15 @@ default_target: all
 TOP=..
 include $(TOP)/mk/boilerplate.mk
 
-SUBDIRS = base old-locale old-time filepath directory process pretty \
-          hpc template-haskell readline Cabal random haskell98
-
+SUBDIRS  = base array packedstring containers bytestring
+SUBDIRS += old-locale old-time filepath directory
 ifeq "$(GhcLibsWithUnix)" "YES"
 SUBDIRS += unix
 endif
 ifeq "$(Windows)" "YES"
 SUBDIRS += $(wildcard Win32)
 endif
+SUBDIRS += process pretty hpc template-haskell readline Cabal random haskell98
 
 # Set GhcBootLibs=YES from the command line to work with just the libraries
 # needed to bootstrap GHC.
@@ -287,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.%:
@@ -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,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 && \