Author: Jeremy Sowden <jeremy@azazel.net>
Last-Update: 2024-12-03
Description: fix build of libxt_ACCOUNT.so and libxt_pknock.so
 The upstream commit 08a16d90ceae ("build: use `$(top_srcdir)` when including
 Makefile.extra") replaces hard-coded relative paths used to include
 Makefile.extra with variables.  However, despite the commit message, the
 variables are enclosed with braces, not parentheses, and it transpires that
 automake does not support the use of braces in this context.  As a result,
 Makefile.extra is not included, and the libxt_ACCOUNT.so and libxt_pknock.so
 extensions are not built.
 .
 Use parentheses instead.
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/xtables-addons/+bug/2080528
Forwarded: https://lore.kernel.org/netfilter-devel/20241203173001.2575351-1-jeremy@azazel.net/

--- a/extensions/ACCOUNT/Makefile.am
+++ b/extensions/ACCOUNT/Makefile.am
@@ -3,7 +3,7 @@
 AM_CPPFLAGS = ${regular_CPPFLAGS} -I${abs_top_srcdir}/extensions
 AM_CFLAGS   = ${regular_CFLAGS} ${libxtables_CFLAGS}
 
-include ${top_srcdir}/Makefile.extra
+include $(top_srcdir)/Makefile.extra
 
 sbin_PROGRAMS = iptaccount
 iptaccount_LDADD = libxt_ACCOUNT_cl.la
--- a/extensions/Makefile.am
+++ b/extensions/Makefile.am
@@ -26,4 +26,4 @@
 
 clean-local: clean_modules
 
-include ${top_srcdir}/Makefile.extra
+include $(top_srcdir)/Makefile.extra
--- a/extensions/pknock/Makefile.am
+++ b/extensions/pknock/Makefile.am
@@ -3,7 +3,7 @@
 AM_CPPFLAGS = ${regular_CPPFLAGS} -I${abs_top_srcdir}/extensions
 AM_CFLAGS   = ${regular_CFLAGS} ${libxtables_CFLAGS}
 
-include ${top_srcdir}/Makefile.extra
+include $(top_srcdir)/Makefile.extra
 
 sbin_PROGRAMS = pknlusr
 dist_man_MANS = pknlusr.8