summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorJoey Hess2014-11-22 12:13:41 -0400
committerJoey Hess2014-11-22 12:13:41 -0400
commit7cbf4841de39761953cf31d32ed86bb4bd949672 (patch)
tree3d8bb9ecd83a24494a40de5211a10f19036a2949 /Makefile
parent557fab609175d7d0a59ffe1269fed02f49f8004e (diff)
parent57ec60d6f307dbf3e237b924e635b90ba889af18 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 43d7d055..459fae36 100644
--- a/Makefile
+++ b/Makefile
@@ -16,10 +16,10 @@ deps:
@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
- $(CABAL) configure
+ @if [ "$(CABAL)" = ./Setup ]; then ghc --make Setup; fi
+ @$(CABAL) configure
-install:
+install: propellor.1
install -d $(DESTDIR)/usr/bin $(DESTDIR)/usr/src/propellor
install -s dist/build/propellor/propellor $(DESTDIR)/usr/bin/propellor
mkdir -p dist/gittmp
@@ -34,8 +34,11 @@ install:
&& git show-ref master --hash > $(DESTDIR)/usr/src/propellor/head
rm -rf dist/gittmp
+propellor.1: doc/usage.mdwn doc/mdwn2man
+ doc/mdwn2man propellor 1 < doc/usage.mdwn > propellor.1
+
clean:
- rm -rf dist Setup tags propellor privdata/local
+ rm -rf dist Setup tags propellor propellor.1 privdata/local
find -name \*.o -exec rm {} \;
find -name \*.hi -exec rm {} \;