on master help sign in
Update to Setup,hs (via Dirk Ullrich)
commit12c93edcd5e3ef0a9d0d69166a303af2c79547a7 authorEdwin Brady <eb@cs.st-andrews.ac.uk> dateSat 21 Jan 2012, 08:24 (15 years ago) parentc67c3f1
2 files changed+7−4
Setup.hs+6−3 lib/Makefile+1−1
Setup.hs+6−3
@@ -25,13 +25,16 @@ postInstLib args flags desc local
2525 let cenv = compilerTemplateEnv (compilerId (compiler local))
2626 let dirs_pkg = substituteInstallDirTemplates penv (installDirTemplates local)
2727 let dirs = substituteInstallDirTemplates cenv dirs_pkg
28− let datad = datadir dirs
29− let datasubd = datasubdir dirs
3028 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
3134 let idir = fromPathTemplate (datadir dirs) ++ "/" ++
3235 fromPathTemplate (datasubdir dirs)
3336 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
3538
3639main = defaultMainWithHooks (simpleUserHooks { postInst = postInstLib,
3740 postClean = postCleanLib })
lib/Makefile+1−1
@@ -1,6 +1,6 @@
11
22check: .PHONY
3− $(BINDIR)/idris --noprelude --verbose --check checkall.idr
3+ $(IDRIS) --noprelude --verbose --check checkall.idr
44
55recheck: clean check
66