MERGED: Define and use $httptopdir for the haddock docs locations

[ghc-hetmet.git] / libraries / Makefile

diff --git a/libraries/Makefile b/libraries/Makefile
index d4ae0ac..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
@@ -382,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 && \