From: Junio C Hamano <gitster@pobox.com>
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.lorimer.id.au/gitweb.git/diff_plain/8f8b8873a9f4e205eff9114e2679a887c38bf27a?ds=inline;hp=-c

Merge branch 'mv/um-pdf'

* mv/um-pdf:
Add support for a pdf version of the user manual
---

8f8b8873a9f4e205eff9114e2679a887c38bf27a
diff --combined Documentation/Makefile
index 5cd8b63ac5,69f4ade06f..144ec32f12
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@@ -32,6 -32,7 +32,7 @@@ DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TX
  prefix?=$(HOME)
  bindir?=$(prefix)/bin
  htmldir?=$(prefix)/share/doc/git-doc
+ pdfdir?=$(prefix)/share/doc/git-doc
  mandir?=$(prefix)/share/man
  man1dir=$(mandir)/man1
  man5dir=$(mandir)/man5
@@@ -50,6 -51,7 +51,7 @@@ infodir?=$(prefix)/share/inf
  MAKEINFO=makeinfo
  INSTALL_INFO=install-info
  DOCBOOK2X_TEXI=docbook2x-texi
+ DBLATEX=dblatex
  ifndef PERL_PATH
  	PERL_PATH = /usr/bin/perl
  endif
@@@ -87,6 -89,8 +89,8 @@@ man7: $(DOC_MAN7
  
  info: git.info gitman.info
  
+ pdf: user-manual.pdf
+ 
  install: install-man
  
  install-man: man
@@@ -107,6 -111,10 +111,10 @@@ install-info: inf
  	  echo "No directory found in $(DESTDIR)$(infodir)" >&2 ; \
  	fi
  
+ install-pdf: pdf
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(pdfdir)
+ 	$(INSTALL) -m 644 user-manual.pdf $(DESTDIR)$(pdfdir)
+ 
  install-html: html
  	sh ./install-webdoc.sh $(DESTDIR)$(htmldir)
  
@@@ -187,18 -195,22 +195,23 @@@ 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
 -	$(MAKEINFO) --no-split $*.texi
 +	$(MAKEINFO) --no-split --no-validate $*.texi
  
  $(patsubst %.txt,%.texi,$(MAN_TXT)): %.texi : %.xml
  	$(RM) $@+ $@
diff --combined Makefile
index aabf0130b9,b1456a2e5b..dee97c1b01
--- a/Makefile
+++ b/Makefile
@@@ -645,7 -645,6 +645,7 @@@ ifeq ($(uname_S),Darwin
  	endif
  	NO_STRLCPY = YesPlease
  	NO_MEMMEM = YesPlease
 +	THREADED_DELTA_SEARCH = YesPlease
  endif
  ifeq ($(uname_S),SunOS)
  	NEEDS_SOCKET = YesPlease
@@@ -1307,6 -1306,9 +1307,9 @@@ html
  info:
  	$(MAKE) -C Documentation info
  
+ pdf:
+ 	$(MAKE) -C Documentation pdf
+ 
  TAGS:
  	$(RM) TAGS
  	$(FIND) . -name '*.[hcS]' -print | xargs etags -a
@@@ -1449,6 -1451,9 +1452,9 @@@ install-html
  install-info:
  	$(MAKE) -C Documentation install-info
  
+ install-pdf:
+ 	$(MAKE) -C Documentation install-pdf
+ 
  quick-install-doc:
  	$(MAKE) -C Documentation quick-install