summaryrefslogtreecommitdiff
path: root/utils/ghc-cabal
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-11-08 21:07:01 +0000
committerIan Lynagh <igloo@earth.li>2009-11-08 21:07:01 +0000
commit7f4b8d9bfbfb0556d51ba1fb25f18e424bd5bf9c (patch)
tree89aaa19b0a4f652fd9629e0ca8a1c51b7f7afe9f /utils/ghc-cabal
parentebaa8c99e67440522c619b2ee8c250191b5d1397 (diff)
downloadhaskell-7f4b8d9bfbfb0556d51ba1fb25f18e424bd5bf9c.tar.gz
Put docs into versioned directory names; fixes trac #3532
You can now have multiple versions of a package installed, and gen_contents_index will do the right thing.
Diffstat (limited to 'utils/ghc-cabal')
-rw-r--r--utils/ghc-cabal/ghc-cabal.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/ghc-cabal/ghc-cabal.hs b/utils/ghc-cabal/ghc-cabal.hs
index ef4e989e6c..b940a2dff5 100644
--- a/utils/ghc-cabal/ghc-cabal.hs
+++ b/utils/ghc-cabal/ghc-cabal.hs
@@ -198,8 +198,8 @@ doInstall ghc ghcpkg strip topdir directory distDir
libsubdir = toPathTemplate "$pkgid",
docdir = toPathTemplate $
if relocatableBuild
- then "$topdir/$pkg"
- else (myDocdir </> "$pkg"),
+ then "$topdir/$pkgid"
+ else (myDocdir </> "$pkgid"),
htmldir = toPathTemplate "$docdir"
}
progs = withPrograms lbi