diff options
| author | Duncan Coutts <duncan@well-typed.com> | 2011-06-09 12:15:49 +0100 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-06-09 13:02:51 +0100 |
| commit | 237fea9fd27a276f6674c76e2eeff0c6634576dd (patch) | |
| tree | 734be820bf611678f07d2775ff99584537e51b67 /utils/ghc-pkg | |
| parent | 75f9f3559b9959f067c893ae3f7c89da7fd18813 (diff) | |
| download | haskell-237fea9fd27a276f6674c76e2eeff0c6634576dd.tar.gz | |
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.
Diffstat (limited to 'utils/ghc-pkg')
| -rw-r--r-- | utils/ghc-pkg/Main.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/utils/ghc-pkg/Main.hs b/utils/ghc-pkg/Main.hs index 4e6b53193a..8e08c4fb97 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 |