From: Jonas Fonseca <fonseca@diku.dk>
Date: Sat, 21 Nov 2009 02:27:52 +0000 (-0500)
Subject: Add make rules to install documentation from the release branch
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7fe7b4127b997464f8127cb6ac0e7181aacad33a;p=tig.git

Add make rules to install documentation from the release branch
---

diff --git a/INSTALL b/INSTALL
index a79a3d5..c762a8a 100644
--- a/INSTALL
+++ b/INSTALL
@@ -10,7 +10,12 @@ The quick and simple way to install tig with documentation is to run:
 	$ make
 	$ make install install-doc
 
-Optionally, you can use the `configure` script to detect library location:
+From tig's git repository it is also possible to install documentation directly
+from the release branch to avoid installing the documentation tool chain:
+
+	$ make install-release-doc
+
+Optionally, you can use the `configure` script to detect dependencies:
 
 	$ ./configure
 	$ make
@@ -49,7 +54,7 @@ configure script and building documentation:
 |Tool				|Description
 |autoconf			|Contains autoreconf for generating configure
 				 from configure.ac.
-|asciidoc (>= 8.0)		|Generates HTML and (DocBook) XML from text.
+|asciidoc (>= 8.4)		|Generates HTML and (DocBook) XML from text.
 |xmlto				|Generates manpages and chunked HTML from XML.
 |DocBook XSL (>= 1.72.0)	|Used by xmlto for building manpages.
 |DocBook (DSSL/Jade) tools	|Generates PDF from XML.
diff --git a/Makefile b/Makefile
index 02d84dc..85fe345 100644
--- a/Makefile
+++ b/Makefile
@@ -85,6 +85,12 @@ install-doc-man: doc-man
 		$(RM) "$$doc+"; \
 	done
 
+install-release-doc-man:
+	GIT_INDEX_FILE=.tmp-doc-index git read-tree release
+	GIT_INDEX_FILE=.tmp-doc-index git checkout-index -f --prefix=./ $(MANDOC)
+	rm -f .tmp-doc-index
+	$(MAKE) install-doc-man
+
 install-doc-html: doc-html
 	mkdir -p $(DESTDIR)$(docdir)/tig
 	for doc in $(HTMLDOC); do \
@@ -95,7 +101,14 @@ install-doc-html: doc-html
 		$(RM) "$$doc+"; \
 	done
 
+install-release-doc-html:
+	GIT_INDEX_FILE=.tmp-doc-index git read-tree release
+	GIT_INDEX_FILE=.tmp-doc-index git checkout-index -f --prefix=./ $(HTMLDOC)
+	rm -f .tmp-doc-index
+	$(MAKE) install-doc-html
+
 install-doc: install-doc-man install-doc-html
+install-release-doc: install-release-doc-man install-release-doc-html
 
 clean:
 	$(RM) -r $(TARNAME) *.spec tig-*.tar.gz tig-*.tar.gz.md5