diff options
| -rw-r--r-- | configure.ac | 2 | ||||
| -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 |
6 files changed, 8 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index d165d52c..3e5e8268 100644 --- a/configure.ac +++ b/configure.ac @@ -127,6 +127,8 @@ AC_SUBST([libxtables_vmajor]) AC_CONFIG_FILES([Makefile extensions/GNUmakefile include/Makefile iptables/Makefile iptables/xtables.pc + iptables/iptables.8 iptables/ip6tables.8 + iptables/iptables-extensions.8.tmpl libipq/Makefile libipq/libipq.pc libiptc/Makefile libiptc/libiptc.pc libiptc/libip4tc.pc libiptc/libip6tc.pc 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. |