docs/build: Misc cleanup

 * Use $(PANDOC) from ./configure
 * Swap '-N' for its less-obscure longer form
 * Don't explicitly echo about markdown.  The call to markdown is emitted
 * Whitespace cleanup

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
CC: Ian Campbell <Ian.Campbell@citrix.com>
CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Campbell <Ian.Campbell@citrix.com>

diff --git a/docs/Makefile b/docs/Makefile
index 854fb50d847a25c5d8be9970fa59ad50a35efad6..f4c8412feebe94c78fd793a144ce59dd1b0bbe65 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -84,7 +84,7 @@ man5/%.5: man/%.pod.5 Makefile
 .PHONY: clean
 clean:
        $(MAKE) -C figs clean
-       rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~ 
+       rm -rf .word_count *.aux *.dvi *.bbl *.blg *.glo *.idx *~
        rm -rf *.ilg *.log *.ind *.toc *.bak *.tmp core
        rm -rf html txt pdf
        rm -rf man5
@@ -115,7 +115,6 @@ html/index.html: $(DOC_HTML) $(CURDIR)/gen-html-index INDEX
 html/%.html: %.markdown
        $(INSTALL_DIR) $(@D)
 ifdef MARKDOWN
-       @echo "Running markdown to generate $*.html ... "
        $(MARKDOWN) $< > $@.tmp ; \
        $(call move-if-changed,$@.tmp,$@)
 else
@@ -189,7 +188,7 @@ endif
 
 pdf/%.pdf: %.markdown
        $(INSTALL_DIR) $(@D)
-       pandoc -N --toc --standalone $< --output $@
+       $(PANDOC) --number-sections --toc --standalone $< --output $@
 
 ifeq (,$(findstring clean,$(MAKECMDGOALS)))
 $(XEN_ROOT)/config/Docs.mk: