X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2FMakefile;h=353425f911177414efcd8df2c4addee6711d5e5c;hb=c351e1951166dd67e3c722cdb32a238a28db6d47;hp=54ddad4208f4f0af71d0e9c61e25123891f0a25c;hpb=114a561582ec4e9b1451680bc097cea0d115c7e7;p=mkws-moved-to-github.git

diff --git a/doc/Makefile b/doc/Makefile
index 54ddad4..353425f 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -3,15 +3,23 @@
 # To build the PDFs, you will need these Debian packages:
 #	texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
 
+# Older versions of pandoc don't do PDF output, but have a companion program
+MARKDOWN2PDF = $(shell which markdown2pdf pandoc | sed 1q)
+
 DOCS = index.html index.pdf \
-       README.html README.pdf \
        mkws-manual.html mkws-manual.pdf \
-       mkws-developer.html mkws-developer.pdf
+       mkws-developer.html mkws-developer.pdf \
+       mkws-doc.css
 
 INSTALLED = $(DOCS:%=../tools/htdocs/%)
 
 all: $(INSTALLED)
 
+../tools/htdocs/%: %
+	rm -f $@
+	cp $< $@
+	chmod ugo-w $@
+
 # For a description of pandoc's markdown format, see:
 # http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html
 
@@ -28,17 +36,20 @@ all: $(INSTALLED)
 #	texlive-latex-recommended
 ../tools/htdocs/%.pdf: %.markdown
 	rm -f $@
-	pandoc --standalone $< -o $@
+	$(MARKDOWN2PDF) --standalone $< -o $@
 	chmod ugo-w $@
 
 clean:
 	rm -f $(INSTALLED)
 	rm -f *.drupal.html
 
+distclean: clean
+	# Nothing more to remove in the doc directory
+
 push:
-	pandoc --toc README.markdown > README.drupal.html
+	pandoc --toc index.markdown > index.drupal.html
 	pandoc --toc mkws-manual.markdown > mkws-manual.drupal.html
-	cat README.drupal.html | ./drupaljson.pl | curl --upload-file - http://www.indexdata.com/script/node/332?services_token=cda1e26e5733ce3f604773e94f0721df5c31a948 -v --header "Content-Type:application/json"
+	cat index.drupal.html | ./drupaljson.pl | curl --upload-file - http://www.indexdata.com/script/node/332?services_token=cda1e26e5733ce3f604773e94f0721df5c31a948 -v --header "Content-Type:application/json"
 	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: