* [PATCH 0/1] doc: include matches/targets in manpage again
@ 2011-06-09 13:29 Jan Engelhardt
2011-06-09 13:29 ` [PATCH] " Jan Engelhardt
0 siblings, 1 reply; 2+ messages in thread
From: Jan Engelhardt @ 2011-06-09 13:29 UTC (permalink / raw)
To: kaber; +Cc: netfilter-devel
I spent some thoughts about this already - should we perhaps separate
the extensions' manpages into their own file, rather than doing a
hackish substitution into ip[6]tables.8.in?
I was thinking of just taking the produced
matches[46].man/targets[46].man and install these, so that the only
postprocessing needed is cat, no sed,
and the result looking something like the xtables-addons(8) manpage.
That way, the duplicate presence of descriptions - since xt pieces
are copied to both - between iptables(8) and ip6tables(8) could also
be removed, and the makefile simplified.
How about it?
For now, this one:
===
The following changes since commit c960bde4a82792c285110589cf8b2cf1438e1b8f:
Bump version to 1.4.11.1 (2011-06-08 15:26:17 +0200)
are available in the git repository at:
git://dev.medozas.de/iptables master
Jan Engelhardt (1):
doc: include matches/targets in manpage again
iptables/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
^ permalink raw reply [flat|nested] 2+ messages in thread
* [PATCH] doc: include matches/targets in manpage again
2011-06-09 13:29 [PATCH 0/1] doc: include matches/targets in manpage again Jan Engelhardt
@ 2011-06-09 13:29 ` Jan Engelhardt
0 siblings, 0 replies; 2+ messages in thread
From: Jan Engelhardt @ 2011-06-09 13:29 UTC (permalink / raw)
To: kaber; +Cc: netfilter-devel
Evil sed did not throw any warning whatsoever when it cannot find the
file.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
iptables/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/iptables/Makefile.am b/iptables/Makefile.am
index 13cca9c..a068278 100644
--- a/iptables/Makefile.am
+++ b/iptables/Makefile.am
@@ -51,10 +51,10 @@ v6_sbin_links = ip6tables ip6tables-restore ip6tables-save
endif
iptables.8: ${srcdir}/iptables.8.in ../extensions/matches4.man ../extensions/targets4.man
- ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches4.man' -e '/@TARGET@/ r extensions/targets4.man' $< >$@;
+ ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r ../extensions/matches4.man' -e '/@TARGET@/ r ../extensions/targets4.man' $< >$@;
ip6tables.8: ${srcdir}/ip6tables.8.in ../extensions/matches6.man ../extensions/targets6.man
- ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r extensions/matches6.man' -e '/@TARGET@/ r extensions/targets6.man' $< >$@;
+ ${AM_VERBOSE_GEN} sed -e 's/@PACKAGE_AND_VERSION@/${PACKAGE} ${PACKAGE_VERSION}/g' -e '/@MATCH@/ r ../extensions/matches6.man' -e '/@TARGET@/ r ../extensions/targets6.man' $< >$@;
pkgconfig_DATA = xtables.pc
--
1.7.3.4
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-06-09 13:29 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-09 13:29 [PATCH 0/1] doc: include matches/targets in manpage again Jan Engelhardt
2011-06-09 13:29 ` [PATCH] " Jan Engelhardt
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.