mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make it easier to override path to asciidoc command

Browse Source 
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>
This commit is contained in:
Dotan Barak
2007-02-11 17:54:40 +02:00
committed by Junio C Hamano
parent 4f75b115d7
commit 1187d7564d
1 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/Makefile
View File

@ -31,6 +31,7 @@ man1dir=$(mandir)/man1
man7dir=$(mandir)/man7 man7dir=$(mandir)/man7
# DESTDIR= # DESTDIR=
ASCIIDOC=asciidoc
INSTALL?=install INSTALL?=install
DOC_REF = origin/man DOC_REF = origin/man
@ -91,16 +92,16 @@ clean:
rm -f $(cmds_txt) rm -f $(cmds_txt)
%.html : %.txt %.html : %.txt
asciidoc -b xhtml11 -d manpage -f asciidoc.conf $< $(ASCIIDOC) -b xhtml11 -d manpage -f asciidoc.conf $<
%.1 %.7 : %.xml %.1 %.7 : %.xml
xmlto -m callouts.xsl man $< xmlto -m callouts.xsl man $<
%.xml : %.txt %.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 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 user-manual.html: user-manual.xml
xmlto html-nochunks $< xmlto html-nochunks $<
@ -108,7 +109,7 @@ user-manual.html: user-manual.xml
glossary.html : glossary.txt sort_glossary.pl glossary.html : glossary.txt sort_glossary.pl
cat $< | \ cat $< | \
perl sort_glossary.pl | \ perl sort_glossary.pl | \
asciidoc -b xhtml11 - > glossary.html $(ASCIIDOC) -b xhtml11 - > glossary.html
howto-index.txt: howto-index.sh $(wildcard howto/*.txt) howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
rm -f $@+ $@ rm -f $@+ $@
@ -116,13 +117,13 @@ howto-index.txt: howto-index.sh $(wildcard howto/*.txt)
mv $@+ $@ mv $@+ $@
$(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt $(patsubst %,%.html,$(ARTICLES)) : %.html : %.txt
asciidoc -b xhtml11 $*.txt $(ASCIIDOC) -b xhtml11 $*.txt
WEBDOC_DEST = /pub/software/scm/git/docs WEBDOC_DEST = /pub/software/scm/git/docs
$(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt $(patsubst %.txt,%.html,$(wildcard howto/*.txt)): %.html : %.txt
rm -f $@+ $@ rm -f $@+ $@
sed -e '1,/^$$/d' $< | asciidoc -b xhtml11 - >$@+ sed -e '1,/^$$/d' $< | $(ASCIIDOC) -b xhtml11 - >$@+
mv $@+ $@ mv $@+ $@
install-webdoc : html install-webdoc : html