From: Jonas Fonseca <fonseca@diku.dk>
To: Sebastian Kuzminsky <seb@highlab.com>
Cc: git@vger.kernel.org
Subject: [PATCH] Fix and clean up man page building
Date: Fri, 20 May 2005 15:35:33 +0200 [thread overview]
Message-ID: <20050520133533.GA27395@diku.dk> (raw)
In-Reply-To: <E1DYpbT-0003jv-JY@highlab.com>
Sebastian Kuzminsky <seb@highlab.com> wrote Thu, May 19, 2005:
> -%.1 : %.xml
> +%.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 $<
This doesn't work for me since make stops when the test fails. Besides
it is a bit verbose. Following is a patch which will only check for
moving when building .7 files. It also cleans up the Makefile so it will
be easier to add the manpages for cogito.
Signed-off-by: Jonas Fonseca <fonseca@diku.dk>
--- f435f47dab3465a47fbd2114cf006e0e869f31a9/Documentation/Makefile (mode:100644)
+++ uncommitted/Documentation/Makefile (mode:100644)
@@ -1,6 +1,7 @@
-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
+DOC_HTML=$(patsubst %.txt,%.html,$(MAN1_TXT) $(MAN7_TXT))
+DOC_MAN=$(patsubst %.txt,%.1,$(MAN1_TXT)) $(patsubst %.txt,%.7,$(MAN7_TXT))
all: $(DOC_HTML) $(DOC_MAN)
@@ -18,10 +19,12 @@
%.html : %.txt
asciidoc -b css-embedded -d manpage $<
+%.7 : %.1
+ # FIXME: this next line works around an output filename bug in asciidoc 6.0.3
+ if [ -f "$<" ]; then mv $< $@; fi
+
%.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 $<
--
Jonas Fonseca
next prev parent reply other threads:[~2005-05-20 13:35 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-19 15:29 manpage name conflict Sebastian Kuzminsky
2005-05-19 15:58 ` Petr Baudis
2005-05-19 16:24 ` Sebastian Kuzminsky
2005-05-19 16:47 ` Linus Torvalds
2005-05-19 16:57 ` Linus Torvalds
2005-05-19 18:18 ` Sebastian Kuzminsky
2005-05-20 13:35 ` Jonas Fonseca [this message]
2005-05-20 14:08 ` [PATCH] Fix and clean up man page building Raja R Harinath
2005-05-20 14:52 ` Jonas Fonseca
2005-05-20 17:09 ` Sebastian Kuzminsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20050520133533.GA27395@diku.dk \
--to=fonseca@diku.dk \
--cc=git@vger.kernel.org \
--cc=seb@highlab.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).