From 9aad194863ee1de63ec658e3a2e734b51caab101 Mon Sep 17 00:00:00 2001 From: Jeremy Sowden Date: Sun, 9 Mar 2025 17:41:27 +0100 Subject: [PATCH] build: fix inclusion of Makefile.extra 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. Link: https://bugs.launchpad.net/ubuntu/+source/xtables-addons/+bug/2080528 Fixes: 08a16d90ceae ("build: use `$(top_srcdir)` when including Makefile.extra") Signed-off-by: Jeremy Sowden --- extensions/ACCOUNT/Makefile.am | 2 +- extensions/Makefile.am | 2 +- extensions/pknock/Makefile.am | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/extensions/ACCOUNT/Makefile.am b/extensions/ACCOUNT/Makefile.am index 2514386..473a739 100644 --- 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 diff --git a/extensions/Makefile.am b/extensions/Makefile.am index 8f0aeb5..b99712d 100644 --- a/extensions/Makefile.am +++ b/extensions/Makefile.am @@ -26,4 +26,4 @@ install-exec-local: modules_install clean-local: clean_modules -include ${top_srcdir}/Makefile.extra +include $(top_srcdir)/Makefile.extra diff --git a/extensions/pknock/Makefile.am b/extensions/pknock/Makefile.am index 1ca5f91..5fcae47 100644 --- 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 -- 2.47.2