[PATCH 1/2] allow installation of man and html doc from the man and html branches

From: Michael J Gruber <michaeljgruber+gmane@fastmail.fm>
Date: Sep 9, 2008, 20:44 UTC
Message-ID: <1082ea29216aba63f5d2b13763eeceebe46e0691.1221035620.git.michaeljgruber+gmane@fastmail.fm>
In-Reply-To: <cover.1221035620.git.michaeljgruber+gmane@fastmail.fm>

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>
---
 Documentation/Makefile |    4 ++++
 INSTALL                |    5 +++++
 Makefile               |    3 +++
 3 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 62269e3..ded0e40 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -44,6 +44,7 @@ MANPAGE_XSL = callouts.xsl
 INSTALL?=install
 RM ?= rm -f
 DOC_REF = origin/man
+HTML_REF = origin/html
 
 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-html:
+	sh ./install-doc-quick.sh $(HTML_REF) $(DESTDIR)$(htmldir)
+
 .PHONY: .FORCE-GIT-VERSION-FILE
diff --git a/INSTALL b/INSTALL
index 2bae53f..7c13473 100644
--- a/INSTALL
+++ b/INSTALL
@@ -117,6 +117,11 @@ Issues of note:
 
 	http://www.kernel.org/pub/software/scm/git/docs/
 
+   There is also "make quick-install-doc" and "make quick-install-html"
+   which installs man pages resp. html documentation from these branches.
+   This does not require asciidoc/xmlto, but it works from within
+   a checkout of git.git only.
+
    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 f4c31c8..eeaf6d4 100644
--- a/Makefile
+++ b/Makefile
@@ -1401,6 +1401,9 @@ install-info:
 quick-install-doc:
 	$(MAKE) -C Documentation quick-install
 
+quick-install-html:
+	$(MAKE) -C Documentation quick-install-html
+
 
 
 ### Maintainer's dist rules

-- 
1.6.0.1.285.g1070