summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2014-11-18 21:18:26 -0400
committerJoey Hess <joey@kitenet.net>2014-11-18 21:18:26 -0400
commitaa3f31940b544e528a5eb3d2e9825a703a8b5013 (patch)
tree0a14bfdf3be969f6029fb54f0c95e2e06ae7d40d /Makefile
parenta19f01a508747fb1f04849616422d1530e8ec2da (diff)
parentb964b4836321832ad8d3be7268fd3af9ed8f5ea8 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 9185099c..43d7d055 100644
--- a/Makefile
+++ b/Makefile
@@ -8,8 +8,8 @@ run: deps build
dev: build tags
build: dist/setup-config
- if ! $(CABAL) build; then $(CABAL) configure; $(CABAL) build; fi
- ln -sf dist/build/propellor-config/propellor-config propellor
+ @if ! $(CABAL) build; then $(CABAL) configure; $(CABAL) build; fi
+ @ln -sf dist/build/propellor-config/propellor-config propellor
deps:
@if [ $$(whoami) = root ]; then apt-get --no-upgrade --no-install-recommends -y install $(DEBDEPS) || (apt-get update && apt-get --no-upgrade --no-install-recommends -y install $(DEBDEPS)); fi || true