summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJonas Smedegaard <dr@jones.dk>2011-02-03 23:29:19 +0100
committerJonas Smedegaard <dr@jones.dk>2011-02-03 23:29:19 +0100
commit7e788fb501b741ae6d98bde9cdb71def935f311d (patch)
treed283630ad40e41d4f56bdb8ed829699987b10d52
parentf85a9c5ad88d1a3c38fbac8d272a284b5661c848 (diff)
Suppress ikiwiki git usage when content is off track.
-rw-r--r--Makefile4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 5cceff2..e841b59 100644
--- a/Makefile
+++ b/Makefile
@@ -8,6 +8,8 @@ IKIWIKI_OPTIONS ?= \
-include shared/themes/Makefile
+avoid-broken-git = $(shell cd content && git symbolic-ref -q HEAD > /dev/null || echo --no-rcs)
+
all: build
init: submodules content
@@ -27,6 +29,6 @@ content: submodules
[ -e '$@/index.mdwn' ] || printf '# Hello world!\n\nHello world!\n' > '$@/index.mdwn'
build: $(cssfiles)
- find config -name *.setup -exec ikiwiki --setup '{}' --rebuild ';'
+ find config -name *.setup -exec ikiwiki --setup '{}' $(avoid-broken-git) --rebuild ';'
.PHONY: all build submodules content