MERGED: installPackage needs to treat $httptopdir the same as $topdir

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index f30554e..0d5e9c3 100644 (file)
--- a/libraries/Makefile
+++ b/libraries/Makefile
@@ -103,7 +103,7 @@ ilibdir     = $$topdir
 ilibexecdir = $$topdir
 idatadir    = $$topdir
 idocdir     = $$topdir/doc/libraries/$$pkgid
-ihtmldir    = $$topdir/doc/libraries/$$pkgid
+ihtmldir    = $$httptopdir/doc/libraries/$$pkgid
 html_installed_root = $(prefix)/doc/libraries
 else
 # On non-Windows we can just give absolute paths all the time, and
@@ -285,7 +285,7 @@ $(foreach SUBDIR,$(SUBDIRS),$(SUBDIR)/GNUmakefile):\
 .PHONY: doc
 
 doc: $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR))
-       sh gen_contents_index
+       sh gen_contents_index --inplace
 
 $(foreach SUBDIR,$(SUBDIRS),doc.library.$(SUBDIR)):\
 doc.library.%: stamp/configure.library.build$(CONFIGURE_STAMP_EXTRAS).% \
@@ -304,6 +304,7 @@ clean: $(foreach SUBDIR,$(SUBDIRS),clean.library.$(SUBDIR))
        $(RM) -rf ifBuildable
        $(RM) -rf installPackage
        $(RM) -f libraries.txt index.html doc-index.html doc-index*.html
+       $(RM) -f haddock* *.gif
 
 distclean:
        $(RM) $(foreach lib, $(SUBDIRS), $(lib)/.depend $(lib)/.depend.bak)
@@ -326,9 +327,9 @@ ifeq "$(HADDOCK_DOCS)" "YES"
        $(INSTALL_DATA)   index.html doc-index*.html                       $(DESTDIR)$(html_installed_root)
        $(INSTALL_SCRIPT) gen_contents_index                               $(DESTDIR)$(html_installed_root)
        # Hacks:
-       $(INSTALL_DATA)   $(DESTDIR)$(html_installed_root)/base*/*.css $(DESTDIR)$(html_installed_root)
-       $(INSTALL_DATA)   $(DESTDIR)$(html_installed_root)/base*/*.js  $(DESTDIR)$(html_installed_root)
-       $(INSTALL_DATA)   $(DESTDIR)$(html_installed_root)/base*/*.gif $(DESTDIR)$(html_installed_root)
+       $(INSTALL_DATA)   base/dist/doc/html/*/*.css $(DESTDIR)$(html_installed_root)
+       $(INSTALL_DATA)   base/dist/doc/html/*/*.js $(DESTDIR)$(html_installed_root)
+       $(INSTALL_DATA)   base/dist/doc/html/*/*.gif $(DESTDIR)$(html_installed_root)
 endif
 
 # Cabal doesn't let us ask to install docs only, so do nothing here
@@ -368,6 +369,10 @@ ifeq "$(HADDOCK_DOCS)" "YES"
        cp    doc-index*.html               $(BIN_DIST_LIBDIR)
 endif
        cp -pR stamp                         $(BIN_DIST_LIBDIR)
+       # This gets used in the compiler directory to see if GHC should
+       # depend on the readline package or not
+       $(MKDIRHIER) $(BIN_DIST_LIBDIR)/readline
+       cp    readline/config.mk            $(BIN_DIST_LIBDIR)/readline
 
 $(foreach SUBDIR,$(SUBDIRS),binary-dist.library.$(SUBDIR)): \
 binary-dist.library.%:
@@ -377,6 +382,7 @@ binary-dist.library.%:
          cp    $*.cabal      $(BIN_DIST_LIBDIR)/$* && \
          cp    LICENSE       $(BIN_DIST_LIBDIR)/$* && \
          cp -R dist          $(BIN_DIST_LIBDIR)/$* && \
+         $(FIND) . -name "*.buildinfo" -exec cp {} $(BIN_DIST_LIBDIR)/$* \; && \
          (cp -RL include      $(BIN_DIST_LIBDIR)/$* || true) && \
          $(FIND) $(BIN_DIST_LIBDIR)/$*/dist \
             \( -name "*_split" -o -name "autogen" \) | xargs rm -rf && \