summaryrefslogtreecommitdiff
path: root/utils
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-11-10 22:36:32 +0000
committerIan Lynagh <igloo@earth.li>2009-11-10 22:36:32 +0000
commitfc641ab54224dad9f92033b3c4b8e010b9e2f403 (patch)
treef407889e6c7b664baf6ef3e1bd25b84fcf0483cf /utils
parent7f4b8d9bfbfb0556d51ba1fb25f18e424bd5bf9c (diff)
downloadhaskell-fc641ab54224dad9f92033b3c4b8e010b9e2f403.tar.gz
Use relative paths for haddockHTMLs in the inplace package.conf
This means that the docs get built with the correct relative paths. When installing, the absolute path will still be used.
Diffstat (limited to 'utils')
-rw-r--r--utils/ghc-cabal/ghc-cabal.hs5
1 files changed, 4 insertions, 1 deletions
diff --git a/utils/ghc-cabal/ghc-cabal.hs b/utils/ghc-cabal/ghc-cabal.hs
index b940a2dff5..ca26ca4479 100644
--- a/utils/ghc-cabal/ghc-cabal.hs
+++ b/utils/ghc-cabal/ghc-cabal.hs
@@ -310,7 +310,10 @@ generate config_args distdir directory
let ipid = InstalledPackageId (display (packageId pd) ++ "-inplace")
let installedPkgInfo = inplaceInstalledPackageInfo cwd distdir
pd lib lbi clbi
- final_ipi = installedPkgInfo{ Installed.installedPackageId = ipid }
+ final_ipi = installedPkgInfo {
+ Installed.installedPackageId = ipid,
+ Installed.haddockHTMLs = ["../" ++ display (packageId pd)]
+ }
content = Installed.showInstalledPackageInfo final_ipi ++ "\n"
writeFileAtomic (distdir </> "inplace-pkg-config") content
_ -> error "Inconsistent lib components; can't happen?"