summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Wooding <mdw@distorted.org.uk>2006-03-05 09:36:33 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-03-05 10:32:13 (GMT)
commit4a5d6939509f9aeef600ea17643caef4c898b12f (patch)
tree28d3ae5666a0704da7e11a276bd0d0548906318b
parentb30cc0daaf8e5c179356e0d9ec9e081464956c7e (diff)
downloadgit-4a5d6939509f9aeef600ea17643caef4c898b12f.zip
git-4a5d6939509f9aeef600ea17643caef4c898b12f.tar.gz
git-4a5d6939509f9aeef600ea17643caef4c898b12f.tar.bz2
Documentation/Makefile: Some `git-*.txt' files aren't manpages.
In particular, git-tools.txt isn't a manpage, and my Asciidoc gets upset by it. The simplest fix is to Remove articles from the list of manpages the Makefile. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
-rw-r--r--Documentation/Makefile6
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile
index a3bca86..f4cbf7e 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -1,4 +1,7 @@
-MAN1_TXT=$(wildcard git-*.txt) gitk.txt
+MAN1_TXT= \
+ $(filter-out $(addsuffix .txt, $(ARTICLES) $(SP_ARTICLES)), \
+ $(wildcard git-*.txt)) \
+ gitk.txt
MAN7_TXT=git.txt
DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
@@ -11,6 +14,7 @@ ARTICLES += howto-index
ARTICLES += repository-layout
ARTICLES += hooks
ARTICLES += everyday
+ARTICLES += git-tools
# with their own formatting rules.
SP_ARTICLES = glossary howto/revert-branch-rebase