[commit: packages/Cabal] ghc-head: Use absolute paths when passing install dirs to the setup script. (91fabb3)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/Cabal

On branch  : ghc-head
Link       : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=91fabb304ceeb7a71642cc5abe18c769ecd484ba

>---------------------------------------------------------------

commit 91fabb304ceeb7a71642cc5abe18c769ecd484ba
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Sat Jul 20 03:23:40 2013 +0200

    Use absolute paths when passing install dirs to the setup script.
    
    Before: '--libsubdir=$arch-$os-$compiler/$pkgid'.
    After:  '--libsubdir=i386-linux-ghc-7.4.2/lifted-base-0.2.1.0'.


>---------------------------------------------------------------

91fabb304ceeb7a71642cc5abe18c769ecd484ba
 cabal-install/Distribution/Client/Install.hs |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/cabal-install/Distribution/Client/Install.hs b/cabal-install/Distribution/Client/Install.hs
index 2ebc5d2..f1addb4 100644
--- a/cabal-install/Distribution/Client/Install.hs
+++ b/cabal-install/Distribution/Client/Install.hs
@@ -1232,12 +1232,14 @@ installUnpackedPackage verbosity buildLimit installLock numJobs
     addDefaultInstallDirs configFlags' = do
       defInstallDirs <- InstallDirs.defaultInstallDirs flavor userInstall False
       return $ configFlags' {
-          configInstallDirs = InstallDirs.combineInstallDirs combine
+          configInstallDirs = fmap Cabal.Flag .
+                              InstallDirs.substituteInstallDirTemplates env $
+                              InstallDirs.combineInstallDirs fromFlagOrDefault
                               defInstallDirs (configInstallDirs configFlags)
           }
         where
           CompilerId flavor _ = compid
-          combine     = \d f -> Cabal.Flag $ fromFlagOrDefault d f
+          env         = initialPathTemplateEnv pkgid compid platform
           userInstall = fromFlagOrDefault defaultUserInstall
                         (configUserInstall configFlags')