diff options
| author | Joey Hess <joey@kitenet.net> | 2014-04-24 18:10:23 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-04-24 18:10:23 -0400 |
| commit | c4f364b249b810410d329a932dea883f36b9a712 (patch) | |
| tree | d4d4ee86efba15249284a41841e17654d901f1f3 /Makefile | |
| parent | 792957153ca9c22de28da7be83940aa5e07af0fa (diff) | |
| parent | 72a6b1c759906025fd6761aeb5ef51e64e60abd7 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -11,7 +11,7 @@ build: dist/setup-config deps: @if [ $$(whoami) = root ]; then apt-get --no-upgrade --no-install-recommends -y install gnupg ghc cabal-install libghc-missingh-dev libghc-ansi-terminal-dev libghc-ifelse-dev libghc-unix-compat-dev libghc-hslogger-dev libghc-network-dev libghc-quickcheck2-dev libghc-mtl-dev libghc-monadcatchio-transformers-dev; fi || true - @if [ $$(whoami) = root ]; then apt-get --no-upgrade --no-install-recommends -y install libghc-async-dev || cabal update; cabal install async; fi || true + @if [ $$(whoami) = root ]; then apt-get --no-upgrade --no-install-recommends -y install libghc-async-dev || (cabal update; cabal install async); fi || true dist/setup-config: propellor.cabal if [ "$(CABAL)" = ./Setup ]; then ghc --make Setup; fi |