From b4890aa689ec0bc44f78f883a89939ad6d62ece9 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sat, 3 Nov 2007 18:00:23 +0000 Subject: [PATCH] MERGED: Define and use $httptopdir for the haddock docs locations Sun Oct 28 05:35:52 PDT 2007 Ian Lynagh --- compiler/main/Packages.lhs | 5 ++++- libraries/Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/compiler/main/Packages.lhs b/compiler/main/Packages.lhs index 1402db1..0b77983 100644 --- 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 --- 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 -- 1.7.10.4