From 237fea9fd27a276f6674c76e2eeff0c6634576dd Mon Sep 17 00:00:00 2001 From: Duncan Coutts Date: Thu, 9 Jun 2011 12:15:49 +0100 Subject: [PATCH] Fix for $topdir appearing in the haddock-html field I'd naively assumed that the haddock-html field would only use the $httptopdir variable. Hopefully this will fix the windows build. --- utils/ghc-pkg/Main.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index 4e6b531..8e08c4f 100644 --- a/utils/ghc-pkg/Main.hs +++ b/utils/ghc-pkg/Main.hs @@ -678,7 +678,8 @@ mungePackagePaths top_dir pkgroot pkg = libraryDirs = munge_paths (libraryDirs pkg), frameworkDirs = munge_paths (frameworkDirs pkg), haddockInterfaces = munge_paths (haddockInterfaces pkg), - haddockHTMLs = munge_urls (haddockHTMLs pkg) + -- haddock-html is allowed to be either a URL or a file + haddockHTMLs = munge_path (munge_urls (haddockHTMLs pkg)) } where munge_paths = map munge_path -- 1.7.10.4