on master help sign in
Fix for install with latest cabal
commit6611494d942d635636ea69f778a07c31f55b0f2d authorEdwin Brady <eb@cs.st-andrews.ac.uk> dateTue 17 Jan 2012, 13:18 (15 years ago) parentc613fab
1 file changed+6−1
Setup.hs+6−1
Setup.hs+6−1
@@ -22,9 +22,14 @@ addPrefix pfx var c = "export " ++ var ++ "=" ++ show pfx ++ "/" ++ c ++ ":$" ++
2222postInstLib args flags desc local
2323 = do let pkg = localPkgDescr local
2424 let penv = packageTemplateEnv (package pkg)
25− let dirs = substituteInstallDirTemplates penv (installDirTemplates local)
25+ let cenv = compilerTemplateEnv (compilerId (compiler local))
26+ let dirs_pkg = substituteInstallDirTemplates penv (installDirTemplates local)
27+ let dirs = substituteInstallDirTemplates cenv dirs_pkg
28+ let datad = datadir dirs
29+ let datasubd = datasubdir dirs
2630 let idir = fromPathTemplate (datadir dirs) ++ "/" ++
2731 fromPathTemplate (datasubdir dirs)
32+ putStrLn $ "Installing libraries in " ++ idir
2833 system' $ "make -C lib install TARGET=" ++ idir
2934
3035main = defaultMainWithHooks (simpleUserHooks { postInst = postInstLib,