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

Sun Oct 28 05:35:52 PDT 2007  Ian Lynagh <igloo@earth.li>

diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs
index 1402db1..0b77983 100644 (file)
--- a/compiler/main/Packages.lhs
+++ b/compiler/main/Packages.lhs
@@ -268,9 +268,12 @@ mungePackagePaths top_dir ps = map munge_pkg ps
   munge_paths = map munge_path
 
   munge_path p 
-         | Just p' <- maybePrefixMatch "$topdir" p = top_dir ++ p'
+         | Just p' <- maybePrefixMatch "$topdir"     p =            top_dir ++ p'
+         | Just p' <- maybePrefixMatch "$httptopdir" p = toHttpPath top_dir ++ p'
          | otherwise                               = p
 
+  toHttpPath p = "file:///" ++ p
+
 
 -- -----------------------------------------------------------------------------
 -- Modify our copy of the package database based on a package flag

diff --git a/libraries/Makefile b/libraries/Makefile
index 06ce2b2..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