|
 |
1dc35b |
From 81f4451d47db33e803fb5a339f898e8911b55df6 Mon Sep 17 00:00:00 2001
|
|
|
1dc35b |
From: Phil Sutter <phil@nwl.cc>
|
|
|
1dc35b |
Date: Wed, 20 Feb 2019 14:02:55 +0100
|
|
|
1dc35b |
Subject: [PATCH] doc: Install ip{6,}tables-translate.8 manpages
|
|
|
1dc35b |
|
|
|
1dc35b |
These are just semantic links to xtables-translate.8.
|
|
|
1dc35b |
|
|
|
1dc35b |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
1dc35b |
Signed-off-by: Florian Westphal <fw@strlen.de>
|
|
|
1dc35b |
(cherry picked from commit b738ca36777851e8f08c20a1e6c5c6492e934b38)
|
|
|
1dc35b |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
1dc35b |
---
|
|
|
1dc35b |
iptables/.gitignore | 2 ++
|
|
|
1dc35b |
iptables/Makefile.am | 5 +++++
|
|
|
1dc35b |
2 files changed, 7 insertions(+)
|
|
|
1dc35b |
|
|
|
1dc35b |
diff --git a/iptables/.gitignore b/iptables/.gitignore
|
|
|
1dc35b |
index d0301c6de896e..c638139b8a1d0 100644
|
|
|
1dc35b |
--- a/iptables/.gitignore
|
|
|
1dc35b |
+++ b/iptables/.gitignore
|
|
|
1dc35b |
@@ -2,6 +2,7 @@
|
|
|
1dc35b |
/ip6tables-save
|
|
|
1dc35b |
/ip6tables-restore
|
|
|
1dc35b |
/ip6tables-static
|
|
|
1dc35b |
+/ip6tables-translate.8
|
|
|
1dc35b |
/iptables
|
|
|
1dc35b |
/iptables.8
|
|
|
1dc35b |
/iptables-extensions.8
|
|
|
1dc35b |
@@ -11,6 +12,7 @@
|
|
|
1dc35b |
/iptables-restore
|
|
|
1dc35b |
/iptables-restore.8
|
|
|
1dc35b |
/iptables-static
|
|
|
1dc35b |
+/iptables-translate.8
|
|
|
1dc35b |
/iptables-xml
|
|
|
1dc35b |
/iptables-xml.1
|
|
|
1dc35b |
/xtables-multi
|
|
|
1dc35b |
diff --git a/iptables/Makefile.am b/iptables/Makefile.am
|
|
|
1dc35b |
index 581dc32ba846b..8e902ef369b8e 100644
|
|
|
1dc35b |
--- a/iptables/Makefile.am
|
|
|
1dc35b |
+++ b/iptables/Makefile.am
|
|
|
1dc35b |
@@ -62,8 +62,10 @@ man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \
|
|
|
1dc35b |
iptables-xml.1 ip6tables.8 ip6tables-restore.8 \
|
|
|
1dc35b |
ip6tables-save.8 iptables-extensions.8 \
|
|
|
1dc35b |
xtables-nft.8 xtables-translate.8 xtables-legacy.8 \
|
|
|
1dc35b |
+ iptables-translate.8 ip6tables-translate.8 \
|
|
|
1dc35b |
xtables-monitor.8
|
|
|
1dc35b |
CLEANFILES = iptables.8 xtables-monitor.8 \
|
|
|
1dc35b |
+ iptables-translate.8 ip6tables-translate.8 \
|
|
|
1dc35b |
xtables-config-parser.c xtables-config-syntax.c
|
|
|
1dc35b |
|
|
|
1dc35b |
vx_bin_links = iptables-xml
|
|
|
1dc35b |
@@ -94,6 +96,9 @@ iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../e
|
|
|
1dc35b |
-e '/@MATCH@/ r ../extensions/matches.man' \
|
|
|
1dc35b |
-e '/@TARGET@/ r ../extensions/targets.man' $< >$@;
|
|
|
1dc35b |
|
|
|
1dc35b |
+iptables-translate.8 ip6tables-translate.8:
|
|
|
1dc35b |
+ ${AM_VERBOSE_GEN} echo '.so man8/xtables-translate.8' >$@
|
|
|
1dc35b |
+
|
|
|
1dc35b |
pkgconfig_DATA = xtables.pc
|
|
|
1dc35b |
|
|
|
1dc35b |
# Using if..fi avoids an ugly "error (ignored)" message :)
|
|
|
1dc35b |
--
|
|
|
1dc35b |
2.21.0
|
|
|
1dc35b |
|