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

…lt as suggested in #1214
haskell · Mar 1, 2013 · fa44826 · fa44826
1 parent 7a0941c
commit fa44826
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/Cabal/Distribution/Simple/InstallDirs.hs b/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",
+      datasubdir   = "$arch-$os-$compiler" </> "$pkgid",
-      docdir       = "$datadir" </> "doc" </> "$pkgid",
+      docdir       = "$datadir" </> "doc" </> "$arch-$os-$compiler" </> "$pkgid",
       mandir       = "$datadir" </> "man",
       htmldir      = "$docdir"  </> "html",
       haddockdir   = "$htmldir"