@matheusbsbs / matheus-bagliano / commits / 6fe570de05
Fork 0

allow installation of man and html doc from the man and html branches

This patch introduces a make target "quick-install-html" which installs the html documentation from the branch origin/html, without the need for asciidoc/xmlto. This is analogous to the existing "quick-install-doc" target for the man pages. We advertise these targets in the INSTALL file now. Signed-off-by: Michael J Gruber <michaeljgruber+gmane@fastmail.fm> Signed-off-by: Junio C Hamano <gitster@pobox.com>

Michael J Gruber committed Sep 9, 2008 at 22:44 UTC 6fe570de05513bc13ac1e00ab3508ca525b41135
3 files changed +13
Documentation/Makefile
+4
@@ -44,6 +44,7 @@ MANPAGE_XSL = callouts.xsl
44 INSTALL?=install
45 RM ?= rm -f
46 DOC_REF = origin/man
47 +HTML_REF = origin/html
48
49 infodir?=$(prefix)/share/info
50 MAKEINFO=makeinfo
@@ -222,4 +223,7 @@ install-webdoc : html
223 quick-install:
224 sh ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)
225
226 +quick-install-html:
227 + sh ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)
228 +
229 .PHONY: .FORCE-GIT-VERSION-FILE
INSTALL
+6
@@ -117,6 +117,12 @@ Issues of note:
117
118 http://www.kernel.org/pub/software/scm/git/docs/
119
120 + There are also "make quick-install-doc" and "make quick-install-html"
121 + which install preformatted man pages and html documentation.
122 + This does not require asciidoc/xmlto, but it only works from within
123 + a cloned checkout of git.git with these two extra branches, and will
124 + not work for the maintainer for obvious chicken-and-egg reasons.
125 +
126 It has been reported that docbook-xsl version 1.72 and 1.73 are
127 buggy; 1.72 misformats manual pages for callouts, and 1.73 needs
128 the patch in contrib/patches/docbook-xsl-manpages-charmap.patch
Makefile
+3
@@ -1403,6 +1403,9 @@ install-info:
1403 quick-install-doc:
1404 $(MAKE) -C Documentation quick-install
1405
1406 +quick-install-html:
1407 + $(MAKE) -C Documentation quick-install-html
1408 +
1409
1410
1411 ### Maintainer's dist rules