diff options
| author |  David Greaves <david@dgreaves.com> | 2005-05-22 18:44:15 +0100 |
|---|---|---|
| committer |  Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-22 11:07:22 -0700 |
| commit | b2bf34d6c5f0867ab189fc64b1c519bfa613275d (patch) | |
| tree | 57204586be507ea4a34be001ae355dd63a14417c /Documentation/Makefile | |
| parent | Split up git-pull-script into separate "fetch" and "merge" phases. (diff) | |
| download | tgif-b2bf34d6c5f0867ab189fc64b1c519bfa613275d.tar.xz | |
[PATCH] Docs - Makefile update
A Makefile that works just fine when the 6 character patch is applied
to asciidoc
Signed-off-by: David Greaves <david@dgreaves.com>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'Documentation/Makefile')
| -rw-r--r-- | Documentation/Makefile | 28 |
1 files changed, 21 insertions, 7 deletions
diff --git a/Documentation/Makefile b/Documentation/Makefile index 27ae781a77..e3844f213b 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -1,12 +1,28 @@ -DOC_SRC=$(wildcard git*.txt) -DOC_HTML=$(patsubst %.txt,%.html,$(DOC_SRC)) -DOC_MAN=$(patsubst %.txt,%.1,$(wildcard git-*.txt)) git.7 +MAN1_TXT=$(wildcard git-*.txt) +MAN7_TXT=git.txt -all: $(DOC_HTML) $(DOC_MAN) +DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT)) + +DOC_MAN1=$(patsubst %.txt,%.1,$(MAN1_TXT)) +DOC_MAN7=$(patsubst %.txt,%.7,$(MAN7_TXT)) + +# +# Please note that there is a minor bug in asciidoc. +# The version after 6.0.3 _will_ include the patch found here: +# http://marc.theaimsgroup.com/?l=git&m=111558757202243&w=2 +# +# Until that version is released you may have to apply the patch +# yourself - yes, all 6 characters of it! +# + +all: html man html: $(DOC_HTML) -man: $(DOC_MAN) + +man: man1 man7 +man1: $(DOC_MAN1) +man7: $(DOC_MAN7) # 'include' dependencies git-diff-%.txt: diff-format.txt @@ -20,8 +36,6 @@ clean: %.1 %.7 : %.xml xmlto man $< - # FIXME: this next line works around an output filename bug in asciidoc 6.0.3 - [ "$@" = "git.7" ] || mv git.1 $@ %.xml : %.txt asciidoc -b docbook -d manpage $< |