summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-19 14:39:40 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-19 14:39:40 -0400
commit21128c88e71cb2050b78f996888d9e251a448807 (patch)
tree4edfea2262e88e9c1633cd5b350a4cf6284a5287
parente8267f1b9e99cce79209eb2f47fce02d52d60b56 (diff)
tweak
-rw-r--r--Makefile11
1 files changed, 7 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 87c725efe..a0911df04 100644
--- a/Makefile
+++ b/Makefile
@@ -1,3 +1,5 @@
+all: git-annex docs
+
git-annex:
mkdir -p build
ghc -odir build -hidir build --make git-annex
@@ -10,15 +12,16 @@ clean:
rm -rf build git-annex
rm -rf doc/.ikiwiki html
-# Build static html docs suitable for being shipped in the software
-# package. This depends on ikiwiki being installed to build the docs.
+# If ikiwiki is available, build static html docs suitable for being
+# shipped in the software package.
ifeq ($(shell which ikiwiki),)
-IKIWIKI=echo "** ikiwiki not found" >&2 ; echo ikiwiki
+IKIWIKI=echo "** ikiwiki not found, skipping building docs" >&2
else
IKIWIKI=ikiwiki
endif
docs:
- $(IKIWIKI) doc html -v --wikiname git-annex --plugin=goodstuff
+ $(IKIWIKI) doc html -v --wikiname git-annex --plugin=goodstuff \
+ --no-usedirs
.PHONY: git-annex