X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=doc%2FMakefile;h=54ddad4208f4f0af71d0e9c61e25123891f0a25c;hb=374f3fd0652039090a55ade533d405c6a8c441af;hp=01d1d1f5423c39c3db72062d67fdfbe3814f9778;hpb=f98deb43272e97a8550cef087b6773c85f98b854;p=mkws-moved-to-github.git

diff --git a/doc/Makefile b/doc/Makefile
index 01d1d1f..54ddad4 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -1,53 +1,46 @@
-# Copyright (c) 2013-2014 IndexData ApS. http://indexdata.com
-
-DOCS = README.html README.odt README.pdf \
-       whitepaper.html whitepaper.odt whitepaper.pdf \
-       library-configuration.html library-configuration.odt library-configuration.pdf
-
-INSTALLABLE = README.html whitepaper.html library-configuration.html mkws-doc.css
-INSTALLED = $(INSTALLABLE:%=../tools/htdocs/%)
-
-install: $(INSTALLED)
+# 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
 
-uninstall:
-	rm -f $(INSTALLED)
+DOCS = index.html index.pdf \
+       README.html README.pdf \
+       mkws-manual.html mkws-manual.pdf \
+       mkws-developer.html mkws-developer.pdf
 
-../tools/htdocs/%: %
-	rm -f $@
-	cp -p $? $@
-	chmod ugo-w $@
+INSTALLED = $(DOCS:%=../tools/htdocs/%)
 
-all: $(DOCS)
+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/whitepaper.markdown
+# perl -i.bak -npe 's/"(Authors|Subjects)": "(.*?)"/"$1": "test"/' tools/htdocs/mkws-manual.markdown
 #
-%.html: %.markdown
-	rm -f $@
-	pandoc --standalone --toc -c mkws-doc.css $< | sed '/^<col width="[0-9]*%" \/>$//d' > $@
-	chmod ugo-w $@
-
-%.odt: %.markdown
+../tools/htdocs/%.html: %.markdown tweak-html
 	rm -f $@
-	pandoc --standalone $< -o $@
+	pandoc --standalone --toc -c mkws-doc.css $< | ./tweak-html > $@
 	chmod ugo-w $@
 
-# ### In order to compile the whitepaper, which has tables, to PDF,
+# ### 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
+	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 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 ]"
+	@echo "make [ all | clean | push ]"