X-Git-Url: http://jsfdemo.indexdata.com/?a=blobdiff_plain;f=tools%2Fhtdocs%2FMakefile;h=d56f697cc8e1a76ca85ebace71a010cf263ee7ad;hb=8a5c1a1a171ed8fc2ff21f1740b6dc5c3f64c321;hp=e73a87a57e0bf5e5911ea612e442a455df56e02b;hpb=1ab02379768462976eebb1fc125e550fa461f7e7;p=mkws-moved-to-github.git

diff --git a/tools/htdocs/Makefile b/tools/htdocs/Makefile
index e73a87a..d56f697 100644
--- a/tools/htdocs/Makefile
+++ b/tools/htdocs/Makefile
@@ -29,21 +29,27 @@ all: ${MKWS_JS} $(DOCS)
 
 docs: $(DOCS)
 
-pz2api-check: 
+pz2api-git-checkout: 
+	@if ! test -e ${PZ2API_JS}; then \
+	    ( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} ); \
+	fi
+
+mkws-js ${MKWS_JS}: mkws.js handlebars-v1.1.2.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?"; \
-	    echo "( cd $$(dirname $$(dirname ${PZ2API_JS})); git clone ${PZ2API_GIT} )"; \
+	    echo "Please run: make pz2api-git-checkout"; \
 	    exit 1; \
 	fi
-
-mkws-js ${MKWS_JS}: pz2api-check ${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}; \
-	  cat ../../../libjs-pz2/pz2api.1.js mkws.js ) > ${MKWS_JS}.new 
+	  curl -sSf ${JQUERY_URL} | perl -npe 's,sourceMappingURL=jquery.*map,,'; \
+	  cat ${PZ2API_JS} mkws.js ) > ${MKWS_JS}.new 
 	mv -f ${MKWS_JS}.new ${MKWS_JS}
 
+handlebars-v1.1.2.js:
+	curl -sSf http://builds.handlebarsjs.com.s3.amazonaws.com/handlebars-v1.1.2.js -o $@
+
 distclean: clean
 clean:
 	rm -f ${MKWS_JS} $(DOCS)
@@ -59,9 +65,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 -c mkws-doc.css $< -o $@
+	pandoc --standalone --toc -c mkws-doc.css $< | sed '/^<col width="[0-9]*%" \/>$//d' > $@
 	chmod ugo-w $@
 
 %.odt: %.markdown
@@ -69,6 +78,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 $@