Fix bindist creation on Windows

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index ed2d92a..1610875 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
@@ -185,24 +186,22 @@ configure: $(foreach SUBDIR,$(SUBDIRS), \
 # We should depend on %/%.cabal here (and in other rules), but make
 # makes that difficult.
 
-# We explicitly set datadir to "$prefix/share" as, while that is the
-# default on Linux, on Windows it defaults to
-# "C:\\Program Files\\Common Files"
+# We explicitly set datadir to a sensible value, as Cabal (used to?) use
+#     "C:\\Program Files\\Common Files"
+# on Windows
 
 # We also set libsubdir differently on Windows and non-Windows, as on
-# non-Windows the path we deduce is highre up than the path passed to
+# non-Windows the path we deduce is higher up than the path passed to
 # the executable with the shell script on non-Windows. This should
 # probably be tidied up so that we can always pass the same libsubdir.
 ifeq "$(Windows)" "YES"
-DATA_REL_DIR = .
-datadir      = $$prefix
-libsubdir    = $$pkgid
+datadir        = $$prefix
+libsubdir      = $$pkgid
 else
-DATA_REL_DIR = share/ghc
-datadir      = $$prefix/share/ghc
-libsubdir    = $$compiler/lib/$$pkgid
+datadir        = $$prefix/share/ghc
+libsubdir      = $$compiler/lib/$$pkgid
 endif
-DOC_ROOT     = $(prefix)/$(DATA_REL_DIR)/doc/html/
+libraryhtmldir = $(htmldir)/libraries
 
 # We rely on all the CONFIGURE_ARGS being quoted with '...', and there
 # being no 's inside the values.
@@ -218,8 +217,9 @@ stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).%: %/setup/Setup
                   $(CONFIGURE_OPTS) \
                   --prefix='$$topdir' \
                   --datadir='$(datadir)' \
-                  --datasubdir='.' \
+                  --datasubdir='$$pkgid' \
                   --libsubdir='$(libsubdir)' \
+                  --docdir='$(libraryhtmldir)' \
                   --with-compiler=../../compiler/stage1/ghc-inplace$ \
                   --with-hc-pkg=../../utils/ghc-pkg/ghc-pkg-inplace$ \
                   --with-hsc2hs=../../utils/hsc2hs/hsc2hs-inplace \
@@ -265,8 +265,6 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\
 
 .PHONY: doc
 
-DOC_SUBDIRS = $(filter-out haskell98,$(SUBDIRS))
-
 doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
        sh gen_contents_index
 
@@ -274,7 +272,7 @@ $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
                %/setup/Setup ifBuildable/ifBuildable
        if ifBuildable/ifBuildable $*; then \
-         cd $* && setup/Setup haddock; \
+         cd $* && setup/Setup haddock --html-location='../$$pkg'; \
        fi
 
 .PHONY: distclean clean clean.library.%
@@ -286,7 +284,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.%:
@@ -300,15 +298,17 @@ endif
 
 .PHONY: install install-docs install.library.%
 
+DESTlibraryhtmldir = $(DESTDIR)$(libraryhtmldir)/html
+
 install: $(foreach SUBDIR,$(SUBDIRS),install.library.$(SUBDIR))
 ifeq "$(HADDOCK_DOCS)" "YES"
-       $(INSTALL_DIR)                              $(DOC_ROOT)
-       $(INSTALL_DATA)   index.html doc-index.html $(DOC_ROOT)
-       $(INSTALL_SCRIPT) gen_contents_index        $(DOC_ROOT)
+       $(INSTALL_DIR)                                      $(DESTlibraryhtmldir)
+       $(INSTALL_DATA)   index.html doc-index.html         $(DESTlibraryhtmldir)
+       $(INSTALL_SCRIPT) gen_contents_index                $(DESTlibraryhtmldir)
        # Hacks:
-       $(INSTALL_DATA)   $(DOC_ROOT)/base/*.css    $(DOC_ROOT)
-       $(INSTALL_DATA)   $(DOC_ROOT)/base/*.js     $(DOC_ROOT)
-       $(INSTALL_DATA)   $(DOC_ROOT)/base/*.gif    $(DOC_ROOT)
+       $(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.css $(DESTlibraryhtmldir)
+       $(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.js  $(DESTlibraryhtmldir)
+       $(INSTALL_DATA)   $(DESTlibraryhtmldir)/base/*.gif $(DESTlibraryhtmldir)
 endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here
@@ -322,7 +322,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) $(datadir) $(libraryhtmldir) $(GHC_PKG_PROG) $(DESTDIR)$(libdir)/package.conf; \
        fi
 
 .PHONY: binary-dist binary-dist.library.%
@@ -335,10 +335,12 @@ binary-dist: $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR))
        mkdir                               $(BIN_DIST_LIBDIR)/ifBuildable
        cp        ifBuildable/ifBuildable       $(BIN_DIST_LIBDIR)/ifBuildable
        cp    Makefile                      $(BIN_DIST_LIBDIR)
+ifeq "$(HADDOCK_DOCS)" "YES"
        cp    gen_contents_index            $(BIN_DIST_LIBDIR)
        cp    index.html                    $(BIN_DIST_LIBDIR)
        cp    doc-index.html                $(BIN_DIST_LIBDIR)
-       cp -a stamp                         $(BIN_DIST_LIBDIR)
+endif
+       cp -pR stamp                         $(BIN_DIST_LIBDIR)
 
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
 binary-dist.library.%:
@@ -346,9 +348,9 @@ binary-dist.library.%:
        if ifBuildable/ifBuildable $*; then \
          cd $* && \
          cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \
-         cp -a dist          $(BIN_DIST_LIBDIR)/$* && \
-       # Euch \
-         (cp -aL include      $(BIN_DIST_LIBDIR)/$* || :) && \
+         cp    LICENSE       $(BIN_DIST_LIBDIR)/$* && \
+         cp -R dist          $(BIN_DIST_LIBDIR)/$* && \
+         (cp -RL include      $(BIN_DIST_LIBDIR)/$* || true) && \
          $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
             \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \
          $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \