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.

diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs
index 4e6b531..8e08c4f 100644 (file)
--- 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