From: Junio C Hamano Date: Wed, 7 Jan 2009 08:09:10 +0000 (-0800) Subject: Merge branch 'mv/um-pdf' X-Git-Tag: v1.6.2-rc0~188 X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=8f8b8873a9f4e205eff9114e2679a887c38bf27a;p=git.git Merge branch 'mv/um-pdf' * mv/um-pdf: Add support for a pdf version of the user manual --- 8f8b8873a9f4e205eff9114e2679a887c38bf27a diff --cc Documentation/Makefile index 5cd8b63ac,69f4ade06..144ec32f1 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@@ -187,14 -195,18 +195,19 @@@ git.info: user-manual.tex user-manual.texi: user-manual.xml $(RM) $@+ $@ - $(DOCBOOK2X_TEXI) user-manual.xml --to-stdout | $(PERL_PATH) fix-texi.perl >$@+ + $(DOCBOOK2X_TEXI) user-manual.xml --encoding=UTF-8 --to-stdout | \ + $(PERL_PATH) fix-texi.perl >$@+ 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 $(RM) $@+ $@ - ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --to-stdout $(xml);)) | \ - $(PERL_PATH) cat-texi.perl $@ >$@+ + ($(foreach xml,$(MAN_XML),$(DOCBOOK2X_TEXI) --encoding=UTF-8 \ + --to-stdout $(xml);)) | $(PERL_PATH) cat-texi.perl $@ >$@+ mv $@+ $@ gitman.info: gitman.texi