netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH xtables-addons] doc: fix version number in xtables-addons.8
@ 2023-08-18 14:28 Jeremy Sowden
  2023-08-18 14:58 ` Jan Engelhardt
  0 siblings, 1 reply; 2+ messages in thread
From: Jeremy Sowden @ 2023-08-18 14:28 UTC (permalink / raw)
  To: Netfilter Devel

In v3.21 a change was made to the man-page template to use `@PACKAGE_VERSION@`,
instead of manually updating the version number on every release.  However,
xtables-addons.8.in is not processed by configure, so the appropriate version is
never filled in.

Update Makefile.mans to handle it.

Fixes: b6611c54f2b5 ("Xtables-addons 3.21")
Signed-off-by: Jeremy Sowden <jeremy@azazel.net>
---
 Makefile.mans.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Makefile.mans.in b/Makefile.mans.in
index 63424f7d558a..17f786d64869 100644
--- a/Makefile.mans.in
+++ b/Makefile.mans.in
@@ -31,7 +31,10 @@ man_run = \
 all: xtables-addons.8
 
 xtables-addons.8: ${srcdir}/xtables-addons.8.in matches.man targets.man
-	${AM_V_GEN}sed -e '/@MATCHES@/ r matches.man' -e '/@TARGET@/ r targets.man' $< >$@;
+	${AM_V_GEN}sed \
+		-e 's/@PACKAGE'_'VERSION@/@PACKAGE_VERSION@/' \
+		-e '/@MATCHES@/ r matches.man' \
+		-e '/@TARGET@/ r targets.man' $< >$@;
 
 matches.man: .manpages.lst ${wcman_matches}
 	$(call man_run,${wlist_matches})
-- 
2.40.1


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH xtables-addons] doc: fix version number in xtables-addons.8
  2023-08-18 14:28 [PATCH xtables-addons] doc: fix version number in xtables-addons.8 Jeremy Sowden
@ 2023-08-18 14:58 ` Jan Engelhardt
  0 siblings, 0 replies; 2+ messages in thread
From: Jan Engelhardt @ 2023-08-18 14:58 UTC (permalink / raw)
  To: Jeremy Sowden; +Cc: Netfilter Devel


On Friday 2023-08-18 16:28, Jeremy Sowden wrote:
> xtables-addons.8: ${srcdir}/xtables-addons.8.in matches.man targets.man
>-	${AM_V_GEN}sed -e '/@MATCHES@/ r matches.man' -e '/@TARGET@/ r targets.man' $< >$@;
>+	${AM_V_GEN}sed \
>+		-e 's/@PACKAGE'_'VERSION@/@PACKAGE_VERSION@/' \

I am surprised the normal escape stanza @@xyz@@ doesn't work..

6/6 applied.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2023-08-18 14:59 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-08-18 14:28 [PATCH xtables-addons] doc: fix version number in xtables-addons.8 Jeremy Sowden
2023-08-18 14:58 ` Jan Engelhardt

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).