@@ -22,9 +22,14 @@ addPrefix pfx var c = "export " ++ var ++ "=" ++ show pfx ++ "/" ++ c ++ ":$" ++
22postInstLib args flags desc local
22postInstLib args flags desc local
23 = do let pkg = localPkgDescr local
23 = do let pkg = localPkgDescr local
24 let penv = packageTemplateEnv (package pkg)
24 let penv = packageTemplateEnv (package pkg)
25+ let cenv = compilerTemplateEnv (compilerId (compiler local))
25− let dirs = substituteInstallDirTemplates penv (installDirTemplates 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
26 let idir = fromPathTemplate (datadir dirs) ++ "/" ++
30 let idir = fromPathTemplate (datadir dirs) ++ "/" ++
27 fromPathTemplate (datasubdir dirs)
31 fromPathTemplate (datasubdir dirs)
32+ putStrLn $ "Installing libraries in " ++ idir
28 system' $ "make -C lib install TARGET=" ++ idir
33 system' $ "make -C lib install TARGET=" ++ idir
30main = defaultMainWithHooks (simpleUserHooks { postInst = postInstLib,
35main = defaultMainWithHooks (simpleUserHooks { postInst = postInstLib,