diff options
| author |  Mark Wooding <mdw@distorted.org.uk> | 2006-03-05 09:36:33 +0000 |
|---|---|---|
| committer |  Junio C Hamano <junkio@cox.net> | 2006-03-05 02:32:13 -0800 |
| commit | 4a5d6939509f9aeef600ea17643caef4c898b12f (patch) | |
| tree | 28d3ae5666a0704da7e11a276bd0d0548906318b | |
| parent | cvsserver: updated documentation (diff) | |
| download | tgif-4a5d6939509f9aeef600ea17643caef4c898b12f.tar.xz | |
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/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index a3bca86cb0..f4cbf7e159 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 |