X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2FMakefile;h=c224fa04c0045ed9932d8565b69e96b2e5b22175;hb=a556c0b2cacf497688dd126b184cf206ffb7eca1;hp=4d49c5857024fb2693ca528f0594185e2a1798a7;hpb=49ce428f24e0718a0849d8f8676ca3a140438ab7;p=mkws-moved-to-github.git

diff --git a/doc/Makefile b/doc/Makefile
index 4d49c58..c224fa0 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,60 +1,45 @@
 # Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
+#
+# To build the PDFs, you will need these Debian packages:
+#	texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
 
-DOCS = README.html README.odt README.pdf \
-       mkws-manual.html mkws-manual.odt mkws-manual.pdf \
-       mkws-developer.html mkws-developer.odt mkws-developer.pdf
-
-INSTALLABLE = README.html mkws-manual.html mkws-developer.html mkws-doc.css
-INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
-
-all: $(DOCS)
+DOCS = index.html index.pdf \
+       mkws-manual.html mkws-manual.pdf \
+       mkws-developer.html mkws-developer.pdf
 
-install: $(INSTALLED)
+INSTALLED = $(DOCS:%=../tools/htdocs/%)
 
-uninstall:
-	rm -f $(INSTALLED)
-
-../tools/htdocs/%: %
-	rm -f $@
-	cp -p $? $@
-	chmod ugo-w $@
+all: $(INSTALLED)
 
 # For a description of pandoc's markdown format, see:
-# http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html -->
+# http://johnmacfarlane.net/pandoc/demo/example9/pandocs-markdown.html
 
 # for older pandoc (<1.9) run first:
 # perl -i.bak -npe 's/"(Authors|Subjects)": "(.*?)"/"$1": "test"/' tools/htdocs/mkws-manual.markdown
 #
-%.html: %.markdown
+../tools/htdocs/%.html: %.markdown tweak-html
 	rm -f $@
-	pandoc --standalone --toc -c mkws-doc.css $< | sed '/^<col width="[0-9]*%" \/>$//d' > $@
-	chmod ugo-w $@
-
-%.odt: %.markdown
-	rm -f $@
-	pandoc --standalone $< -o $@
+	pandoc --standalone --toc -c mkws-doc.css $< | ./tweak-html > $@
 	chmod ugo-w $@
 
 # ### 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 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:
-	@echo "make [ all | install | clean | distclean | push ]"
+	@echo "make [ all | clean | push ]"