X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=8ad95ce0fa800ed0c274b9e913c62ad57f5827c3;hb=16aed0a8939f9d9caa11dce61431363fc1b9b5ec;hp=55963a229425bfc37651de884540806c4b0a80f7;hpb=e20705d6b607cc724a0a8137530d121178202c27;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index 55963a2..8ad95ce 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -34,7 +34,7 @@ pz2api-git-checkout:
 	    ( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} ); \
 	fi
 
-mkws-js ${MKWS_JS}: ${PZ2API_JS} mkws.js
+mkws-js ${MKWS_JS}: mkws.js
 	@if ! test -e ${PZ2API_JS}; then \
 	    echo "The pazpar2 JS file ${PZ2API_JS} does not exists."; \
 	    echo "Did you checked out the source from the git repo?"; \
@@ -44,7 +44,7 @@ mkws-js ${MKWS_JS}: ${PZ2API_JS} mkws.js
 	( echo "/* created at: $$(date)"; \
 	  echo "   mkws.js GIT id: $$(git log mkws.js | head -n 1 | perl -npe 's,\S+\s+,,') */"; \
 	  curl -sSf ${JQUERY_URL} | perl -npe 's,sourceMappingURL=jquery.*map,,'; \
-	  cat ../../../libjs-pz2/pz2api.1.js mkws.js ) > ${MKWS_JS}.new 
+	  cat ${PZ2API_JS} mkws.js ) > ${MKWS_JS}.new 
 	mv -f ${MKWS_JS}.new ${MKWS_JS}
 
 distclean: clean
@@ -62,9 +62,12 @@ help:
 # For a description of pandoc's markdown format, see:
 # 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
+#
 %.html: %.markdown
 	rm -f $@
-	pandoc --standalone --toc -c mkws-doc.css $< -o $@
+	pandoc --standalone --toc -c mkws-doc.css $< | sed '/^<col width="[0-9]*%" \/>$//d' > $@
 	chmod ugo-w $@
 
 %.odt: %.markdown
@@ -72,6 +75,9 @@ help:
 	pandoc --standalone $< -o $@
 	chmod ugo-w $@
 
+# ### In order to compile the whitepaper, which has tables, to PDF,
+# you will need to install the Debian package
+#	texlive-latex-recommended
 %.pdf: %.markdown
 	rm -f $@
 	pandoc --standalone $< -o $@