From 2bab740da22556adfb86552f292eb753ae0b7bda Mon Sep 17 00:00:00 2001 From: Josef 'Jeff' Sipek Date: Sun, 23 Mar 2014 12:49:48 -0400 Subject: [PATCH] Documentation: clean up the makefile It seems unclean to just use xmlto and perl without having variables to wrap the invocations. Signed-off-by: Josef 'Jeff' Sipek --- Documentation/Makefile | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index b3930bb..b6c3285 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -20,8 +20,9 @@ man7dir=$(mandir)/man7 ASCIIDOC=asciidoc ASCIIDOC_EXTRA = INSTALL?=install -DOC_REF = origin/man +XMLTO=xmlto XMLTO_EXTRA = --skip-validation +PERL=perl all: html man @@ -46,7 +47,7 @@ install-html: html # doc.dep : $(wildcard *.txt) build-docdep.perl rm -f $@+ $@ - perl ./build-docdep.perl >$@+ + $(PERL) ./build-docdep.perl >$@+ mv $@+ $@ -include doc.dep @@ -72,7 +73,7 @@ usage-%.txt: $(MAN1_TXT) usage.sh $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $(ASCIIDOC_EXTRA) $< %.1 %.7 : %.xml - xmlto -m callouts.xsl $(XMLTO_EXTRA) man $< + $(XMLTO) -m callouts.xsl $(XMLTO_EXTRA) man $< %.xml : %.txt footer.txt version.txt $(ASCIIDOC) -b docbook -a version=$(VERSION) -d manpage -f asciidoc.conf $< -- 2.11.4.GIT