simonmichael/hledger
1
1
Fork 0
mirror of https://github.com/simonmichael/hledger.git synced 2024-09-18 17:57:11 +03:00
Code Issues Projects Releases Wiki Activity

tools: have cabal use configured GHC version too

Browse Source
This commit is contained in:
Simon Michael 2014-04-19 12:02:20 -07:00
parent 1b6ccc03bc
commit c36244bfe6
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -29,6 +29,8 @@ PRINT=lpr
GHC=ghc GHC=ghc
GHCI=ghci GHCI=ghci
HADDOCK=haddock HADDOCK=haddock
CABAL=cabal
CABALINSTALL=cabal install -w $(GHC)
# used for make auto, http://joyful.com/repos/searchpath # used for make auto, http://joyful.com/repos/searchpath
SP=sp SP=sp
@ -155,7 +157,7 @@ defaulttarget: bin/hledgerdev
# (or, as many as possible) # (or, as many as possible)
EXTRAINSTALLARGS= EXTRAINSTALLARGS=
install: install:
cabal install $(patsubst %,./%,$(PACKAGES)) $(EXTRAINSTALLARGS) $(CABALINSTALL) $(patsubst %,./%,$(PACKAGES)) $(EXTRAINSTALLARGS)
# run a cabal command in all hledger package dirs # run a cabal command in all hledger package dirs
allcabal%: allcabal%:
@ -449,7 +451,7 @@ fullcabaltest:
&& cd $$p \ && cd $$p \
&& cabal clean \ && cabal clean \
&& cabal check \ && cabal check \
&& cabal install \ && $(CABALINSTALL) \
&& cabal sdist \ && cabal sdist \
); done \ ); done \
&& echo $@ PASSED) || echo $@ FAILED && echo $@ PASSED) || echo $@ FAILED