From eeea1000233a352f1a3bee3122b37e2d9fafe0e0 Mon Sep 17 00:00:00 2001 From: joey Date: Wed, 21 Mar 2007 23:23:21 +0000 Subject: [PATCH] improve Makefile --- doc/examples/softwaresite.mdwn | 6 +++--- doc/examples/softwaresite/Makefile | 15 +++++++++++++++ doc/examples/softwaresite/doc/Makefile | 9 --------- 3 files changed, 18 insertions(+), 12 deletions(-) create mode 100644 doc/examples/softwaresite/Makefile delete mode 100644 doc/examples/softwaresite/doc/Makefile diff --git a/doc/examples/softwaresite.mdwn b/doc/examples/softwaresite.mdwn index 2b68ee4e4..f9490254c 100644 --- 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; - 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 index 000000000..57a0c9737 --- /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 index 5a5fc85ee..000000000 --- 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 -- 2.26.2