1 --- ghc-6.12.3/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs~ 2010-06-09 20:10:19.000000000 +0200
2 +++ ghc-6.12.3/libraries/Cabal/Cabal/Distribution/Simple/InstallDirs.hs 2010-08-26 21:28:52.969002660 +0200
4 -- users to be able to configure @--libdir=\/usr\/lib64@ for example but
5 -- because by default we want to support installing multiple versions of
6 -- packages and building the same package for multiple compilers we append the
7 --- libsubdir to get: @\/usr\/lib64\/$libname\/$compiler@.
8 +-- libsubdir to get: @\/usr\/lib64\/$compiler\/$libname@.
10 -- An additional complication is the need to support relocatable packages on
11 -- systems which support such things, like Windows.
13 libdir = installLibDir,
14 libsubdir = case comp of
16 - _other -> "$abi" </> "$libname",
17 + _other -> "$compiler" </> "$pkgid",
18 dynlibdir = "$libdir" </> case comp of
21 - libexecsubdir= "$abi" </> "$pkgid",
22 + libexecsubdir= "$pkgid",
24 libexecdir = case buildOS of
25 Windows -> "$prefix" </> "$libname"
27 datadir = case buildOS of
29 _other -> "$prefix" </> "share",
30 - datasubdir = "$abi" </> "$pkgid",
31 + datasubdir = "$pkgid",
32 docdir = "$datadir" </> "doc" </> "$abi" </> "$pkgid",
33 mandir = "$datadir" </> "man",
34 htmldir = "$docdir" </> "html",