[commit: packages/Cabal] ghc-head: Allow more variables in the sysconfdir path template. (8b6dc0c)

git at git.haskell.org git at git.haskell.org
Mon Aug 26 23:31:15 CEST 2013


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

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

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

commit 8b6dc0c2eac8fa1e42334d2651fc1689c12b7483
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date:   Fri Aug 23 17:08:44 2013 +0200

    Allow more variables in the sysconfdir path template.


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

8b6dc0c2eac8fa1e42334d2651fc1689c12b7483
 Cabal/Distribution/Simple/InstallDirs.hs |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Cabal/Distribution/Simple/InstallDirs.hs b/Cabal/Distribution/Simple/InstallDirs.hs
index 93a956b..32ba7b7 100644
--- a/Cabal/Distribution/Simple/InstallDirs.hs
+++ b/Cabal/Distribution/Simple/InstallDirs.hs
@@ -294,7 +294,7 @@ substituteInstallDirTemplates env dirs = dirs'
       htmldir    = subst htmldir    (prefixBinLibDataVars ++ [docdirVar]),
       haddockdir = subst haddockdir (prefixBinLibDataVars ++
                                       [docdirVar, htmldirVar]),
-      sysconfdir = subst sysconfdir [prefixVar]
+      sysconfdir = subst sysconfdir prefixBinLibVars
     }
     subst dir env' = substPathTemplate (env'++env) (dir dirs)
 





More information about the ghc-commits mailing list