* [iptables PATCH 1/2] doc: Install nft-variant man pages only if enabled
@ 2019-07-23 15:24 Phil Sutter
2019-07-23 15:24 ` [iptables PATCH 2/2] doc: Install ip{6,}tables-restore-translate.8 man pages Phil Sutter
0 siblings, 1 reply; 2+ messages in thread
From: Phil Sutter @ 2019-07-23 15:24 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
Man pages relevant for nftables backend only (xtables-*, *-translate.8)
were installed even if --disable-nftables was given at configure time.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
iptables/Makefile.am | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index 3ff85893b2fa8..11abb23977e8c 100644
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -58,13 +58,13 @@ sbin_PROGRAMS += xtables-nft-multi
endif
man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \
iptables-xml.1 ip6tables.8 ip6tables-restore.8 \
- ip6tables-save.8 iptables-extensions.8 \
- xtables-nft.8 xtables-translate.8 xtables-legacy.8 \
- iptables-translate.8 ip6tables-translate.8 \
- xtables-monitor.8
+ ip6tables-save.8 iptables-extensions.8
if ENABLE_NFTABLES
-man_MANS += arptables-nft.8 arptables-nft-restore.8 arptables-nft-save.8 \
- ebtables-nft.8
+man_MANS += xtables-nft.8 xtables-translate.8 xtables-legacy.8 \
+ iptables-translate.8 ip6tables-translate.8 \
+ xtables-monitor.8 \
+ arptables-nft.8 arptables-nft-restore.8 arptables-nft-save.8 \
+ ebtables-nft.8
endif
CLEANFILES = iptables.8 xtables-monitor.8 \
iptables-translate.8 ip6tables-translate.8 \
--
2.22.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [iptables PATCH 2/2] doc: Install ip{6,}tables-restore-translate.8 man pages
2019-07-23 15:24 [iptables PATCH 1/2] doc: Install nft-variant man pages only if enabled Phil Sutter
@ 2019-07-23 15:24 ` Phil Sutter
0 siblings, 0 replies; 2+ messages in thread
From: Phil Sutter @ 2019-07-23 15:24 UTC (permalink / raw)
To: Pablo Neira Ayuso; +Cc: netfilter-devel
Just like in b738ca3677785 ("doc: Install ip{6,}tables-translate.8
manpages"), create man pages for *-restore-translate tools as semantic
links to xtables-translate.8.
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
iptables/.gitignore | 2 ++
iptables/Makefile.am | 3 ++-
2 files changed, 4 insertions(+), 1 deletion(-)
diff --git a/iptables/.gitignore b/iptables/.gitignore
index c638139b8a1d0..d46adc8a32f02 100644
--- a/iptables/.gitignore
+++ b/iptables/.gitignore
@@ -3,6 +3,7 @@
/ip6tables-restore
/ip6tables-static
/ip6tables-translate.8
+/ip6tables-restore-translate.8
/iptables
/iptables.8
/iptables-extensions.8
@@ -13,6 +14,7 @@
/iptables-restore.8
/iptables-static
/iptables-translate.8
+/iptables-restore-translate.8
/iptables-xml
/iptables-xml.1
/xtables-multi
diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index 11abb23977e8c..d2207a47a7a26 100644
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -62,6 +62,7 @@ man_MANS = iptables.8 iptables-restore.8 iptables-save.8 \
if ENABLE_NFTABLES
man_MANS += xtables-nft.8 xtables-translate.8 xtables-legacy.8 \
iptables-translate.8 ip6tables-translate.8 \
+ iptables-restore-translate.8 ip6tables-restore-translate.8 \
xtables-monitor.8 \
arptables-nft.8 arptables-nft-restore.8 arptables-nft-save.8 \
ebtables-nft.8
@@ -98,7 +99,7 @@ iptables-extensions.8: iptables-extensions.8.tmpl ../extensions/matches.man ../e
-e '/@MATCH@/ r ../extensions/matches.man' \
-e '/@TARGET@/ r ../extensions/targets.man' $< >$@;
-iptables-translate.8 ip6tables-translate.8:
+iptables-translate.8 ip6tables-translate.8 iptables-restore-translate.8 ip6tables-restore-translate.8:
${AM_VERBOSE_GEN} echo '.so man8/xtables-translate.8' >$@
pkgconfig_DATA = xtables.pc
--
2.22.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-07-23 15:24 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-07-23 15:24 [iptables PATCH 1/2] doc: Install nft-variant man pages only if enabled Phil Sutter
2019-07-23 15:24 ` [iptables PATCH 2/2] doc: Install ip{6,}tables-restore-translate.8 man pages Phil Sutter
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).