From: Pablo Neira Ayuso <pablo@netfilter.org>
To: Jan Engelhardt <jengelh@inai.de>
Cc: netfilter-devel@vger.kernel.org
Subject: Re: [PATCH 01/13] doc: add package version to all manpages
Date: Wed, 26 Dec 2012 15:33:00 +0100 [thread overview]
Message-ID: <20121226143300.GB31482@1984> (raw)
In-Reply-To: <1356477089-13241-2-git-send-email-jengelh@inai.de>
On Wed, Dec 26, 2012 at 12:11:17AM +0100, Jan Engelhardt wrote:
> diff --git a/iptables/Makefile.am b/iptables/Makefile.am
> index 61e78db..0f4c1f6 100644
> --- a/iptables/Makefile.am
> +++ b/iptables/Makefile.am
> @@ -27,8 +27,8 @@ xtables_multi_LDADD += ../libxtables/libxtables.la -lm
> sbin_PROGRAMS = xtables-multi
> man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \
> iptables-xml.1 ip6tables.8 ip6tables-restore.8 \
> - ip6tables-save.8 iptables-extensions.8
> -CLEANFILES = iptables.8 ip6tables.8
> + ip6tables-save.8 iptables-extensions.8 iptables-apply.8
> +CLEANFILES = ${man_MANS}
>
> vx_bin_links = iptables-xml
> if ENABLE_IPV4
> @@ -38,14 +38,36 @@ if ENABLE_IPV6
> v6_sbin_links = ip6tables ip6tables-restore ip6tables-save
> endif
>
> -iptables.8: ${srcdir}/iptables.8.in
> - ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' $< >$@;
> +fill_in_date = ${AM_V_GEN} sed -e \
> + 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' \
> + $< >$@;
> +
> +iptables-xml.1: ${srcdir}/iptables-xml.1.in
> + ${fill_in_date}
> +
> +ip6tables-restore.8: ${srcdir}/ip6tables-restore.8.in
> + ${fill_in_date}
> +
> +ip6tables-save.8: ${srcdir}/ip6tables-save.8.in
> + ${fill_in_date}
>
> ip6tables.8: ${srcdir}/ip6tables.8.in
> - ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' $< >$@;
> + ${fill_in_date}
> +
> +iptables-apply.8: ${srcdir}/iptables-apply.8.in
> + ${fill_in_date}
> +
> +iptables-restore.8: ${srcdir}/iptables-restore.8.in
> + ${fill_in_date}
> +
> +iptables-save.8: ${srcdir}/iptables-save.8.in
> + ${fill_in_date}
> +
> +iptables.8: ${srcdir}/iptables.8.in
> + ${fill_in_date}
This belongs more naturally to the ./configure stage, including
setting the date via AC_SUBST. You should be able to make it with
little changes in configure.ac.
For iptables-extensions.8 it will be a special case, it still requires
part of the magic in the makefile to build the page.
next prev parent reply other threads:[~2012-12-26 14:33 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-12-25 23:11 Documentation and a build fix Jan Engelhardt
2012-12-25 23:11 ` [PATCH 01/13] doc: add package version to all manpages Jan Engelhardt
2012-12-26 14:33 ` Pablo Neira Ayuso [this message]
2012-12-26 14:34 ` Pablo Neira Ayuso
2012-12-25 23:11 ` [PATCH 02/13] doc: fixup omissions in ip6tables-restore.8 Jan Engelhardt
2012-12-25 23:11 ` [PATCH 03/13] doc: document iptables-restore's -t option Jan Engelhardt
2012-12-25 23:11 ` [PATCH 04/13] doc: document iptables-restore's -v option Jan Engelhardt
2012-12-25 23:11 ` [PATCH 05/13] doc: document iptables-restore's -M option Jan Engelhardt
2012-12-25 23:11 ` [PATCH 06/13] doc: document iptables-restore's -h option Jan Engelhardt
2012-12-25 23:11 ` [PATCH 07/13] doc: name the supported log levels for ipt_LOG Jan Engelhardt
2012-12-25 23:11 ` [PATCH 08/13] src: remove faulty deprecated marker in libipt_LOG source Jan Engelhardt
2012-12-25 23:11 ` [PATCH 09/13] iptables: fix order of internal commands list Jan Engelhardt
2012-12-26 14:27 ` Pablo Neira Ayuso
2012-12-25 23:11 ` [PATCH 10/13] iptables: implement --line-numbers for iptables -S Jan Engelhardt
2012-12-25 23:11 ` [PATCH 11/13] doc: mention -m in the manpage Jan Engelhardt
2012-12-25 23:11 ` [PATCH 12/13] doc: document the -4 and -6 options Jan Engelhardt
2012-12-26 8:21 ` Maciej Żenczykowski
2012-12-25 23:11 ` [PATCH 13/13] build: resolve link failure for ip6t_NETMAP Jan Engelhardt
2013-01-07 1:52 ` Documentation and a build fix Pablo Neira Ayuso
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=20121226143300.GB31482@1984 \
--to=pablo@netfilter.org \
--cc=jengelh@inai.de \
--cc=netfilter-devel@vger.kernel.org \
/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).