From fc641ab54224dad9f92033b3c4b8e010b9e2f403 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Tue, 10 Nov 2009 22:36:32 +0000 Subject: [PATCH] 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. --- utils/ghc-cabal/ghc-cabal.hs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/utils/ghc-cabal/ghc-cabal.hs b/utils/ghc-cabal/ghc-cabal.hs index b940a2d..ca26ca4 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?" -- 1.7.10.4