undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mv/um-pdf'

Browse Source 
* mv/um-pdf:
  Add support for a pdf version of the user manual
This commit is contained in:
Junio C Hamano 2009-01-07 00:09:10 -08:00
commit 8f8b8873a9
3 changed files with 22 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Documentation/Makefile
View File

@ -32,6 +32,7 @@ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT))
prefix?=$(HOME) prefix?=$(HOME)
bindir?=$(prefix)/bin bindir?=$(prefix)/bin
htmldir?=$(prefix)/share/doc/git-doc htmldir?=$(prefix)/share/doc/git-doc
pdfdir?=$(prefix)/share/doc/git-doc
mandir?=$(prefix)/share/man mandir?=$(prefix)/share/man
man1dir=$(mandir)/man1 man1dir=$(mandir)/man1
man5dir=$(mandir)/man5 man5dir=$(mandir)/man5
@ -50,6 +51,7 @@ infodir?=$(prefix)/share/info
MAKEINFO=makeinfo MAKEINFO=makeinfo
INSTALL_INFO=install-info INSTALL_INFO=install-info
DOCBOOK2X_TEXI=docbook2x-texi DOCBOOK2X_TEXI=docbook2x-texi
DBLATEX=dblatex
ifndef PERL_PATH ifndef PERL_PATH
PERL_PATH = /usr/bin/perl PERL_PATH = /usr/bin/perl
endif endif
@ -87,6 +89,8 @@ man7: $(DOC_MAN7)
info: git.info gitman.info info: git.info gitman.info
pdf: user-manual.pdf
install: install-man install: install-man
install-man: man install-man: man
@ -107,6 +111,10 @@ install-info: info
echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \ echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \
fi fi
install-pdf: pdf
$(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir)
$(INSTALL) -m 644 user-manual.pdf $(DESTDIR)$(pdfdir)
install-html: html install-html: html
sh ./install-webdoc.sh $(DESTDIR)$(htmldir) sh ./install-webdoc.sh $(DESTDIR)$(htmldir)
@ -191,6 +199,11 @@ user-manual.texi: user-manual.xml
$(PERL_PATH) fix-texi.perl >$@+ $(PERL_PATH) fix-texi.perl >$@+
mv $@+ $@ mv $@+ $@
user-manual.pdf: user-manual.xml
$(RM) $@+ $@
$(DBLATEX) -o $@+ -p /etc/asciidoc/dblatex/asciidoc-dblatex.xsl -s /etc/asciidoc/dblatex/asciidoc-dblatex.sty $<
mv $@+ $@
gitman.texi: $(MAN_XML) cat-texi.perl gitman.texi: $(MAN_XML) cat-texi.perl
$(RM) $@+ $@ $(RM) $@+ $@
($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \ ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \

3
INSTALL
View File

@ -101,6 +101,9 @@ Issues of note:
Building and installing the info file additionally requires Building and installing the info file additionally requires
makeinfo and docbook2X. Version 0.8.3 is known to work. makeinfo and docbook2X. Version 0.8.3 is known to work.
Building and installing the pdf file additionally requires
dblatex. Version 0.2.7 with asciidoc >= 8.2.7 is known to work.
The documentation is written for AsciiDoc 7, but "make The documentation is written for AsciiDoc 7, but "make
ASCIIDOC8=YesPlease doc" will let you format with AsciiDoc 8. ASCIIDOC8=YesPlease doc" will let you format with AsciiDoc 8.

6
Makefile
View File

@ -1307,6 +1307,9 @@ html:
info: info:
$(MAKE) -C Documentation info $(MAKE) -C Documentation info
pdf:
$(MAKE) -C Documentation pdf
TAGS: TAGS:
$(RM) TAGS $(RM) TAGS
$(FIND) . -name '*.[hcS]' -print | xargs etags -a $(FIND) . -name '*.[hcS]' -print | xargs etags -a
@ -1449,6 +1452,9 @@ install-html:
install-info: install-info:
$(MAKE) -C Documentation install-info $(MAKE) -C Documentation install-info
install-pdf:
$(MAKE) -C Documentation install-pdf
quick-install-doc: quick-install-doc:
$(MAKE) -C Documentation quick-install $(MAKE) -C Documentation quick-install