summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoey Hess2014-06-09 12:29:33 -0400
committerJoey Hess2014-06-09 12:29:33 -0400
commita1341ccb315a98e407a25bf25411759b6f8f58d2 (patch)
tree1fb9fcf383c2b15cbef169ea6b5552a2c1997c99 /Makefile
parentfc49d75e4fb9e8d2c7ce9d60647a26ecc030d253 (diff)
propellor spin
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 2f339a89..79852688 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ dev: build tags
build: dist/setup-config
if ! $(CABAL) build; then $(CABAL) configure; $(CABAL) build; fi
- ln -sf dist/build/config/config propellor
+ ln -sf dist/build/propellor-config/propellor-config propellor
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
@@ -19,13 +19,13 @@ dist/setup-config: propellor.cabal
install:
install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor
- install -s dist/build/wrapper/wrapper $(DESTDIR)/usr/bin/propellor
+ install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor
$(CABAL) sdist
cat dist/propellor-*.tar.gz | \
(cd $(DESTDIR)/usr/src/propellor && tar zx --strip-components=1)
clean:
- rm -rf dist Setup tags propellor propellor-wrapper privdata/local
+ rm -rf dist Setup tags propellor privdata/local
find -name \*.o -exec rm {} \;
find -name \*.hi -exec rm {} \;