improve Makefile

diff --git a/doc/examples/softwaresite.mdwn b/doc/examples/softwaresite.mdwn
index 2b68ee4e441e623c9a95e3ee876faeba8daa9dac..f9490254cd7504af8202a5368b6adff332af5cd7 100644 (file)
--- a/doc/examples/softwaresite.mdwn
+++ b/doc/examples/softwaresite.mdwn
@@ -8,6 +8,6 @@ Some additional configuration you might want to do:
 
 * The softwaresite/doc subdirectory is intended to hold docs about your
   software package. These docs can be included in the package itself;
 
 * The softwaresite/doc subdirectory is intended to hold docs about your
   software package. These docs can be included in the package itself;

-  there is a [[softwaresite/doc/Makefile]] that will use ikiwiki to build
-  static html documentation from the docs directory. ikiwiki itself uses a
-  similar system to build its documentation.
+  there is a [[softwaresite/Makefile]] that will use ikiwiki to build
+  static html documentation. ikiwiki itself uses a similar system to build
+  its documentation.

diff --git a/doc/examples/softwaresite/Makefile b/doc/examples/softwaresite/Makefile
new file mode 100644 (file)
index 0000000..57a0c97
--- /dev/null
+++ b/doc/examples/softwaresite/Makefile
@@ -0,0 +1,15 @@
+# Build static html docs suitable for being shipped in the software
+# package. This depends on ikiwiki being installed to build the docs.
+
+ifeq ($(shell which ikiwiki),)
+IKIWIKI=echo "** ikiwiki not found" >&2 ; echo ikiwiki
+else
+IKIWIKI=ikiwiki
+endif
+
+all:
+       $(IKIWIKI) `pwd` html -v --plugin=goodstuff \
+               --no-rcs --exclude=/discussion --exclude=html --no-discussion
+
+clean:
+       rm -rf .ikiwiki html

diff --git a/doc/examples/softwaresite/doc/Makefile b/doc/examples/softwaresite/doc/Makefile
deleted file mode 100644 (file)
index 5a5fc85..0000000
--- a/doc/examples/softwaresite/doc/Makefile
+++ /dev/null
@@ -1,9 +0,0 @@
-# Build static html docs suitable for being shipped in the software
-# package.
-
-all:
-       ikiwiki `pwd` html -v --plugin=goodstuff \
-               --no-rcs --exclude=/discussion --exclude=html --no-discussion
-
-clean:
-       rm -rf .ikiwiki