Permalink
Browse files

Adds $arch-$os-$compiler to libsubdir, datasubdir and docdir by defau…

…lt as suggested in #1214
  • Loading branch information...
lukexi committed Feb 21, 2013
1 parent 7a0941c commit fa448266af549336ab29db1978c47120de3deef7
Showing with 3 additions and 3 deletions.
  1. +3 −3 Cabal/Distribution/Simple/InstallDirs.hs
@@ -236,7 +236,7 @@ defaultInstallDirs comp userInstall _hasLibs = do
JHC -> "$compiler"
LHC -> "$compiler"
UHC -> "$pkgid"
- _other -> "$pkgid" </> "$compiler",
+ _other -> "$arch-$os-$compiler" </> "$pkgid",
dynlibdir = "$libdir",
libexecdir = case buildOS of
Windows -> "$prefix" </> "$pkgid"
@@ -246,8 +246,8 @@ defaultInstallDirs comp userInstall _hasLibs = do
datadir = case buildOS of
Windows -> "$prefix"
_other -> "$prefix" </> "share",
- datasubdir = "$pkgid",
- docdir = "$datadir" </> "doc" </> "$pkgid",
+ datasubdir = "$arch-$os-$compiler" </> "$pkgid",
+ docdir = "$datadir" </> "doc" </> "$arch-$os-$compiler" </> "$pkgid",
mandir = "$datadir" </> "man",
htmldir = "$docdir" </> "html",
haddockdir = "$htmldir"

0 comments on commit fa44826

Please sign in to comment.