diff options
author | Andy Spencer <andy753421@gmail.com> | 2013-05-19 17:01:06 +0000 |
---|---|---|
committer | Pablo Neira Ayuso <pablo@netfilter.org> | 2013-05-29 19:36:33 +0200 |
commit | 14bca55dde79adddd77999ae262b8132ae0396f9 (patch) | |
tree | b3dd60340f8d8588456945667a2041f429c15ac0 /iptables | |
parent | 8df3c38438bb75edb480845913af77692c8a5c99 (diff) | |
download | platform_external_iptables-14bca55dde79adddd77999ae262b8132ae0396f9.tar.gz platform_external_iptables-14bca55dde79adddd77999ae262b8132ae0396f9.tar.bz2 platform_external_iptables-14bca55dde79adddd77999ae262b8132ae0396f9.zip |
iptables: use autoconf to process .in man pages
This fixes a bug in iptables.8 and ip6tables.8 where @PACKAGE_VERSION@
was not processed in the VERSION section. It also simplifies the
Makefile by avoiding some sed commands.
[ Mangled this patch to rename iptables-extensions.8.in to
iptables-extensions.8.tmpl.in to avoid having a file whose name
is terminated by .in.in --pablo ]
Signed-off-by: Andy Spencer <andy753421@gmail.com>
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
Diffstat (limited to 'iptables')
-rw-r--r-- | iptables/.gitignore | 1 | ||||
-rw-r--r-- | iptables/Makefile.am | 11 | ||||
-rw-r--r-- | iptables/ip6tables.8.in | 2 | ||||
-rw-r--r-- | iptables/iptables-extensions.8.tmpl.in (renamed from iptables/iptables-extensions.8.in) | 2 | ||||
-rw-r--r-- | iptables/iptables.8.in | 2 |
5 files changed, 6 insertions, 12 deletions
diff --git a/iptables/.gitignore b/iptables/.gitignore index 4fc63aa4..c9c31788 100644 --- a/iptables/.gitignore +++ b/iptables/.gitignore @@ -6,6 +6,7 @@ /iptables /iptables.8 /iptables-extensions.8 +/iptables-extensions.8.tmpl /iptables-save /iptables-restore /iptables-static diff --git a/iptables/Makefile.am b/iptables/Makefile.am index 61e78db9..46d24630 100644 --- a/iptables/Makefile.am +++ b/iptables/Makefile.am @@ -38,15 +38,8 @@ 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' $< >$@; - -ip6tables.8: ${srcdir}/ip6tables.8.in - ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' $< >$@; - -iptables-extensions.8: ${srcdir}/iptables-extensions.8.in ../extensions/matches.man ../extensions/targets.man - ${AM_VERBOSE_GEN} sed -e \ - 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' \ +iptables-extensions.8: ${srcdir}/iptables-extensions.8.tmpl ../extensions/matches.man ../extensions/targets.man + ${AM_VERBOSE_GEN} sed \ -e '/@MATCH@/ r ../extensions/matches.man' \ -e '/@TARGET@/ r ../extensions/targets.man' $< >$@; diff --git a/iptables/ip6tables.8.in b/iptables/ip6tables.8.in index 86348548..05e0d0f7 100644 --- a/iptables/ip6tables.8.in +++ b/iptables/ip6tables.8.in @@ -1,4 +1,4 @@ -.TH IP6TABLES 8 "" "@PACKAGE_AND_VERSION@" "@PACKAGE_AND_VERSION@" +.TH IP6TABLES 8 "" "@PACKAGE_STRING@" "@PACKAGE_STRING@" .\" .\" Man page written by Andras Kis-Szabo <kisza@sch.bme.hu> .\" It is based on iptables man page. diff --git a/iptables/iptables-extensions.8.in b/iptables/iptables-extensions.8.tmpl.in index 9ec3fb0b..99d89a1f 100644 --- a/iptables/iptables-extensions.8.in +++ b/iptables/iptables-extensions.8.tmpl.in @@ -1,4 +1,4 @@ -.TH iptables-extensions 8 "" "@PACKAGE_AND_VERSION@" "@PACKAGE_AND_VERSION@" +.TH iptables-extensions 8 "" "@PACKAGE_STRING@" "@PACKAGE_STRING@" .SH NAME iptables-extensions \(em list of extensions in the standard iptables distribution .SH SYNOPSIS diff --git a/iptables/iptables.8.in b/iptables/iptables.8.in index 9643705f..0fba603d 100644 --- a/iptables/iptables.8.in +++ b/iptables/iptables.8.in @@ -1,4 +1,4 @@ -.TH IPTABLES 8 "" "@PACKAGE_AND_VERSION@" "@PACKAGE_AND_VERSION@" +.TH IPTABLES 8 "" "@PACKAGE_STRING@" "@PACKAGE_STRING@" .\" .\" Man page written by Herve Eychenne <rv@wallfire.org> (May 1999) .\" It is based on ipchains page. |