Merge

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

diff --git a/doc/Makefile b/doc/Makefile
index c168a76..7d2cbbd 100644 (file)
--- 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)
+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 \
@@ -31,12 +31,9 @@ all: $(INSTALLED)
        pandoc --standalone --toc -c mkws-doc.css $< | ./tweak-html > $@
        chmod ugo-w $@
 
-# ### In order to compile the manual, which has tables, to PDF,
-# you will need to install the Debian package
-#      texlive-latex-recommended
 ../tools/htdocs/%.pdf: %.markdown
        rm -f $@
-       $(MARKDOWN2PDF) --standalone $< -o $@
+       $(MARKDOWN2PDF) $< -o $@
        chmod ugo-w $@
 
 clean: