Get rid of rules to make a .odt -- who needs that?

[mkws-moved-to-github.git] / doc / Makefile

diff --git a/doc/Makefile b/doc/Makefile
index d87c1f8..13c03c2 100644 (file)
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,10 +1,11 @@
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
+# Copyright (c) 2013-2014 Index Data ApS. http://indexdata.com
 
-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
+DOCS = index.html index.pdf \
+       README.html README.pdf \
+       mkws-manual.html mkws-manual.pdf \
+       mkws-developer.html mkws-developer.pdf
 
-INSTALLABLE = README.html mkws-manual.html mkws-developer.html mkws-doc.css
+INSTALLABLE = index.html README.html mkws-manual.html mkws-developer.html mkws-doc.css
 INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
 
 install: $(INSTALLED)
@@ -25,14 +26,9 @@ 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
+%.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,