From: David A. Greene <greened@obbligato.org>
Date: Sun, 29 Jan 2012 22:17:43 +0000 (-0600)
Subject: Use project config files
X-Git-Tag: v1.7.11-rc0~173
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5163d476d04dc940b2e74d79c60e3b32fea12f02;p=git.git

Use project config files

Use project-wide files to process documentation for git-subtree.

Signed-off-by: David A. Greene <greened@obbligato.org>
---

diff --git a/contrib/subtree/Makefile b/contrib/subtree/Makefile
index 91e0cc08e..21130af6f 100644
--- a/contrib/subtree/Makefile
+++ b/contrib/subtree/Makefile
@@ -10,6 +10,9 @@ INSTALL_DATA = $(INSTALL) -c -m 0644
 INSTALL_EXE = $(INSTALL) -c -m 0755
 INSTALL_DIR = $(INSTALL) -c -d -m 0755
 
+ASCIIDOC_CONF      = ../../Documentation/asciidoc.conf
+MANPAGE_NORMAL_XSL =  ../../Documentation/manpage-normal.xsl
+
 default:
 	@echo "git-subtree doesn't need to be built."
 	@echo "Just copy it somewhere on your PATH, like /usr/local/bin."
@@ -31,12 +34,12 @@ install-doc: git-subtree.1
 doc: git-subtree.1
 
 %.1: %.xml
-	xmlto -m manpage-normal.xsl  man $^
+	xmlto -m $(MANPAGE_NORMAL_XSL)  man $^
 
 %.xml: %.txt
-	asciidoc -b docbook -d manpage -f asciidoc.conf \
+	asciidoc -b docbook -d manpage -f $(ASCIIDOC_CONF) \
 		-agit_version=$(gitver) $^
-		
+
 test:
 	./test.sh