From: Mike Taylor <mike@indexdata.com>
Date: Thu, 16 Oct 2014 15:04:54 +0000 (+0100)
Subject: This time for sure on MKWS-296.
X-Git-Tag: 1.0.0~171
X-Git-Url: http://lists.indexdata.dk/cgi-bin?a=commitdiff_plain;h=e8b1a78d47715662856c5501802d73f25ee71919;p=mkws-moved-to-github.git

This time for sure on MKWS-296.
Do not include the --standalone option when invoking markdown2pdf
---

diff --git a/doc/Makefile b/doc/Makefile
index 353425f..7e59c93 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -4,7 +4,7 @@
 #	texlive-latex-recommended texlive-latex-extra texlive-fonts-recommended
 
 # Older versions of pandoc don't do PDF output, but have a companion program
-MARKDOWN2PDF = $(shell which markdown2pdf pandoc | sed 1q)
+MARKDOWN2PDF = $(shell if which markdown2pdf > /dev/null; then echo markdown2pdf; else echo pandoc --standalone; fi)
 
 DOCS = index.html index.pdf \
        mkws-manual.html mkws-manual.pdf \
@@ -36,7 +36,7 @@ all: $(INSTALLED)
 #	texlive-latex-recommended
 ../tools/htdocs/%.pdf: %.markdown
 	rm -f $@
-	$(MARKDOWN2PDF) --standalone $< -o $@
+	$(MARKDOWN2PDF) $< -o $@
 	chmod ugo-w $@
 
 clean: