@@ -25,13 +25,16 @@ postInstLib args flags desc local
25 let cenv = compilerTemplateEnv (compilerId (compiler local))
25 let cenv = compilerTemplateEnv (compilerId (compiler local))
26 let dirs_pkg = substituteInstallDirTemplates penv (installDirTemplates local)
26 let dirs_pkg = substituteInstallDirTemplates penv (installDirTemplates local)
27 let dirs = substituteInstallDirTemplates cenv dirs_pkg
27 let dirs = substituteInstallDirTemplates cenv dirs_pkg
28− let datad = datadir dirs
29− let datasubd = datasubdir dirs
30 let bind = fromPathTemplate (bindir dirs)
28 let bind = fromPathTemplate (bindir dirs)
29+ let progPart t = L.substPathTemplate (packageId desc) local (t local)
30+ let progpfx = progPart progPrefix
31+ let progsfx = progPart progSuffix
32+ let PackageName pkgname = (packageName desc)
33+ let icmd = bind ++ "/" ++ progpfx ++ pkgname ++ progsfx
31 let idir = fromPathTemplate (datadir dirs) ++ "/" ++
34 let idir = fromPathTemplate (datadir dirs) ++ "/" ++
32 fromPathTemplate (datasubdir dirs)
35 fromPathTemplate (datasubdir dirs)
33 putStrLn $ "Installing libraries in " ++ idir
36 putStrLn $ "Installing libraries in " ++ idir
34− system' $ "make -C lib install TARGET=" ++ idir ++ " BINDIR=" ++ bind
37+ system' $ "make -C lib install TARGET=" ++ idir ++ " IDRIS=" ++ icmd
36main = defaultMainWithHooks (simpleUserHooks { postInst = postInstLib,
39main = defaultMainWithHooks (simpleUserHooks { postInst = postInstLib,
37 postClean = postCleanLib })
40 postClean = postCleanLib })