@matheusbsbs / matheus-bagliano / commits / 1187d7564d
Fork 0

Make it easier to override path to asciidoc command

Allow setting the path of asciidoc in only one place when creating the documentation. Signed-off-by: Dotan Barak <dotanb@dev.mellanox.co.il> Signed-off-by: Junio C Hamano <junkio@cox.net>

Dotan Barak committed Feb 11, 2007 at 17:54 UTC 1187d7564d67b532df402050711cb494ceaec2f9
1 file changed +7 -6
Documentation/Makefile
+7 -6
@@ -31,6 +31,7 @@ man1dir=$(mandir)/man1
31 man7dir=$(mandir)/man7
32 # DESTDIR=
33
34 +ASCIIDOC=asciidoc
35 INSTALL?=install
36 DOC_REF = origin/man
37
@@ -91,16 +92,16 @@ clean:
92 rm -f $(cmds_txt)
93
94 %.html : %.txt
94 - asciidoc -b xhtml11 -d manpage -f asciidoc.conf $<
95 + $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $<
96
97 %.1 %.7 : %.xml
98 xmlto -m callouts.xsl man $<
99
100 %.xml : %.txt
100 - asciidoc -b docbook -d manpage -f asciidoc.conf $<
101 + $(ASCIIDOC) -b docbook -d manpage -f asciidoc.conf $<
102
103 user-manual.xml: user-manual.txt user-manual.conf
103 - asciidoc -b docbook -d book $<
104 + $(ASCIIDOC) -b docbook -d book $<
105
106 user-manual.html: user-manual.xml
107 xmlto html-nochunks $<
@@ -108,7 +109,7 @@ user-manual.html: user-manual.xml
109 glossary.html : glossary.txt sort_glossary.pl
110 cat $< | \
111 perl sort_glossary.pl | \
111 - asciidoc -b xhtml11 - > glossary.html
112 + $(ASCIIDOC) -b xhtml11 - > glossary.html
113
114 howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
115 rm -f $@+ $@
@@ -116,13 +117,13 @@ howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
117 mv $@+ $@
118
119 $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
119 - asciidoc -b xhtml11 $*.txt
120 + $(ASCIIDOC) -b xhtml11 $*.txt
121
122 WEBDOC_DEST = /pub/software/scm/git/docs
123
124 $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
125 rm -f $@+ $@
125 - sed -e '1,/^$$/d' $< | asciidoc -b xhtml11 - >$@+
126 + sed -e '1,/^$$/d' $< | $(ASCIIDOC) -b xhtml11 - >$@+
127 mv $@+ $@
128
129 install-webdoc : html