From: Mike Taylor <mike@indexdata.com>
Date: Tue, 14 Oct 2014 15:57:55 +0000 (+0100)
Subject: Fix MKWS-286.
X-Git-Tag: 1.0.0~214
X-Git-Url: http://jsfdemo.indexdata.com/cgi-bin?a=commitdiff_plain;h=114a561582ec4e9b1451680bc097cea0d115c7e7;p=mkws-moved-to-github.git

Fix MKWS-286.

mkws/docs/Makefile now compiles HTML and PDF files directly into
../tools/htdocs instead of building local copies, and installing them
where they're needed using a separate "make install".
---

diff --git a/doc/Makefile b/doc/Makefile
index f009f82..54ddad4 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -8,20 +8,9 @@ DOCS = index.html index.pdf \
        mkws-manual.html mkws-manual.pdf \
        mkws-developer.html mkws-developer.pdf
 
-INSTALLABLE = index.html README.html mkws-manual.html mkws-developer.html mkws-doc.css
-INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
+INSTALLED = $(DOCS:%=../tools/htdocs/%)
 
-install: $(INSTALLED)
-
-uninstall:
-	rm -f $(INSTALLED)
-
-../tools/htdocs/%: %
-	rm -f $@
-	cp -p $? $@
-	chmod ugo-w $@
-
-all: $(DOCS)
+all: $(INSTALLED)
 
 # For a description of pandoc's markdown format, see:
 # http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html
@@ -29,7 +18,7 @@ all: $(DOCS)
 # for older pandoc (<1.9) run first:
 # perl -i.bak -npe 's/"(Authors|Subjects)": "(.*?)"/"$1": "test"/' tools/htdocs/mkws-manual.markdown
 #
-%.html: %.markdown tweak-html
+../tools/htdocs/%.html: %.markdown tweak-html
 	rm -f $@
 	pandoc --standalone --toc -c mkws-doc.css $< | ./tweak-html > $@
 	chmod ugo-w $@
@@ -37,17 +26,15 @@ all: $(DOCS)
 # ### In order to compile the manual, which has tables, to PDF,
 # you will need to install the Debian package
 #	texlive-latex-recommended
-%.pdf: %.markdown
+../tools/htdocs/%.pdf: %.markdown
 	rm -f $@
 	pandoc --standalone $< -o $@
 	chmod ugo-w $@
 
 clean:
-	rm -f $(DOCS)
+	rm -f $(INSTALLED)
 	rm -f *.drupal.html
 
-distclean: clean uninstall
-
 push:
 	pandoc --toc README.markdown > README.drupal.html
 	pandoc --toc mkws-manual.markdown > mkws-manual.drupal.html
@@ -55,5 +42,5 @@ push:
 	cat mkws-manual.drupal.html | ./drupaljson.pl | curl --upload-file - http://www.indexdata.com/script/node/323?services_token=cda1e26e5733ce3f604773e94f0721df5c31a948 -v --header "Content-Type:application/json"
 
 help:
-	@echo "make [ all | install | clean | distclean | push ]"
+	@echo "make [ all | clean | push ]"