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>

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 62269e39c4edf95b2cf2e6a60bff2a33b239b07e..ded0e40b978e6f4b85530541c45782f2b383ea44 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -44,6 +44,7 @@ MANPAGE_XSL = callouts.xsl
 INSTALL?=install
 RM ?= rm -f
 DOC_REF = origin/man
 INSTALL?=install
 RM ?= rm -f
 DOC_REF = origin/man

+HTML_REF = origin/html

 
 infodir?=$(prefix)/share/info
 MAKEINFO=makeinfo
 
 infodir?=$(prefix)/share/info
 MAKEINFO=makeinfo


@@ -222,4 +223,7 @@ install-webdoc : html
 quick-install:
        sh ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)
 
 quick-install:
        sh ./install-doc-quick.sh $(DOC_REF) $(DESTDIR)$(mandir)
 

+quick-install-html:
+       sh ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)
+

 .PHONY: .FORCE-GIT-VERSION-FILE
 .PHONY: .FORCE-GIT-VERSION-FILE

diff --git a/INSTALL b/INSTALL
index 2bae53fcbb990eded5626c2c47ebce8684d081cf..15462e970d7e4b8dbc7282391ea7f9c7a5228ef2 100644 (file)
--- a/INSTALL
+++ b/INSTALL
@@ -117,6 +117,12 @@ Issues of note:
 
        http://www.kernel.org/pub/software/scm/git/docs/
 
 
        http://www.kernel.org/pub/software/scm/git/docs/
 

+   There are also "make quick-install-doc" and "make quick-install-html"
+   which install preformatted man pages and html documentation.
+   This does not require asciidoc/xmlto, but it only works from within
+   a cloned checkout of git.git with these two extra branches, and will
+   not work for the maintainer for obvious chicken-and-egg reasons.
+

    It has been reported that docbook-xsl version 1.72 and 1.73 are
    buggy; 1.72 misformats manual pages for callouts, and 1.73 needs
    the patch in contrib/patches/docbook-xsl-manpages-charmap.patch
    It has been reported that docbook-xsl version 1.72 and 1.73 are
    buggy; 1.72 misformats manual pages for callouts, and 1.73 needs
    the patch in contrib/patches/docbook-xsl-manpages-charmap.patch

diff --git a/Makefile b/Makefile
index cf320cd0b0713f8927c2987e6bb62fab9ae7d622..857bc0990a3c08960fc1c29a18d369ec981eb0ed 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1403,6 +1403,9 @@ install-info:
 quick-install-doc:
        $(MAKE) -C Documentation quick-install
 
 quick-install-doc:
        $(MAKE) -C Documentation quick-install
 

+quick-install-html:
+       $(MAKE) -C Documentation quick-install-html
+

 
 
 ### Maintainer's dist rules
 
 
 ### Maintainer's dist rules