diff options
| author | Joey Hess <joey@kitenet.net> | 2014-06-09 12:32:15 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2014-06-09 12:32:15 -0400 |
| commit | 70ab611efdaf8bba6becc42bef14cc47486d42a6 (patch) | |
| tree | a5e5a10056601d90a1a3fbd05c397bf484540c8a /Makefile | |
| parent | bfbe9b2c9aaeb4e923dedabd8f5a53a0bd9c3acf (diff) | |
| parent | a1341ccb315a98e407a25bf25411759b6f8f58d2 (diff) | |
Merge branch 'joeyconfig'
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -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 {} \; |