[PATCH] Allow setting the path of asciidoc in only one place when creating the documentation
From: Dotan Barak <hidden>
Date: 2016-06-15 22:42:53
Allow setting the path of asciidoc in only one place when creating the documentation. Signed-off-by: Dotan Barak <redacted> --- Index: git-1.5.0.rc4/Documentation/Makefile ===================================================================
--- git-1.5.0.rc4.orig/Documentation/Makefile 2007-02-08 01:05:14.000000000 +0200
+++ git-1.5.0.rc4/Documentation/Makefile 2007-02-11 17:37:05.000000000 +0200@@ -31,6 +31,7 @@ man1dir=$(mandir)/man1 man7dir=$(mandir)/man7 # DESTDIR= +ASCIIDOC=asciidoc INSTALL?=install DOC_REF = origin/man
@@ -91,16 +92,16 @@ clean: rm -f $(cmds_txt) %.html : %.txt - asciidoc -b xhtml11 -d manpage -f asciidoc.conf $< + $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $< %.1 %.7 : %.xml xmlto -m callouts.xsl man $< %.xml : %.txt - asciidoc -b docbook -d manpage -f asciidoc.conf $< + $(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf $< user-manual.xml: user-manual.txt user-manual.conf - asciidoc -b docbook -d book $< + $(ASCIIDOC) -b docbook -d book $< user-manual.html: user-manual.xml xmlto html-nochunks $<
@@ -108,7 +109,7 @@ user-manual.html: user-manual.xml glossary.html : glossary.txt sort_glossary.pl cat $< | \ perl sort_glossary.pl | \ - asciidoc -b xhtml11 - > glossary.html + $(ASCIIDOC) -b xhtml11 - > glossary.html howto-index.txt: howto-index.sh $(wildcard howto/*.txt) rm -f $@+ $@
@@ -116,13 +117,13 @@ howto-index.txt: howto-index.sh $(wildca mv $@+ $@ $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt - asciidoc -b xhtml11 $*.txt + $(ASCIIDOC) -b xhtml11 $*.txt WEBDOC_DEST = /pub/software/scm/git/docs $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt rm -f $@+ $@ - sed -e '1,/^$$/d' $< | asciidoc -b xhtml11 - >$@+ + sed -e '1,/^$$/d' $< | $(ASCIIDOC) -b xhtml11 - >$@+ mv $@+ $@ install-webdoc : html