[conntrack-tools PATCH] Makefile.am: Use ${} instead of @...@

[conntrack-tools PATCH] Makefile.am: Use ${} instead of @...@

[Phil Sutter]

Referencing to variables using @...@ means they will be replaced by
configure. This is not needed and may cause problems later.

Suggested-by: Jan Engelhardt <jengelh@inai.de>
Signed-off-by: Phil Sutter <phil@nwl.cc>
---
 Makefile.am             | 2 +-
 src/Makefile.am         | 2 +-
 src/helpers/Makefile.am | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f64d60438d411..df4c0cbf71664 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,7 +7,7 @@ EXTRA_DIST = $(man_MANS) Make_global.am doc m4 tests
 
 SUBDIRS   = extensions src
 DIST_SUBDIRS = include src extensions
-LIBS = @LIBNETFILTER_CONNTRACK_LIBS@
+LIBS = $(LIBNETFILTER_CONNTRACK_LIBS)
 
 dist-hook:
 	rm -rf `find $(distdir)/doc -name *.orig`
diff --git a/src/Makefile.am b/src/Makefile.am
index c4393119f54a3..2e66ee96b7095 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -35,7 +35,7 @@ if HAVE_CTHELPER
 nfct_LDADD += ${LIBNETFILTER_CTHELPER_LIBS}
 endif
 
-nfct_LDFLAGS = -export-dynamic @LAZY_LDFLAGS@
+nfct_LDFLAGS = -export-dynamic ${LAZY_LDFLAGS}
 
 conntrackd_SOURCES = alarm.c main.c run.c hash.c queue.c queue_tx.c rbtree.c \
 		    local.c log.c mcast.c udp.c netlink.c vector.c \
diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am
index 58c9ad00e67bc..e4f10c974bb0f 100644
--- a/src/helpers/Makefile.am
+++ b/src/helpers/Makefile.am
@@ -11,7 +11,7 @@ pkglib_LTLIBRARIES = ct_helper_amanda.la \
 		     ct_helper_slp.la	\
 		     ct_helper_ssdp.la
 
-HELPER_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) @LAZY_LDFLAGS@
+HELPER_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) $(LAZY_LDFLAGS)
 HELPER_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
 
 ct_helper_amanda_la_SOURCES = amanda.c
@@ -32,7 +32,7 @@ ct_helper_mdns_la_CFLAGS = $(HELPER_CFLAGS)
 
 ct_helper_rpc_la_SOURCES = rpc.c
 ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS)
-ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) @LIBTIRPC_CFLAGS@
+ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) $(LIBTIRPC_CFLAGS)
 
 ct_helper_tftp_la_SOURCES = tftp.c
 ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS)
-- 
2.24.0

Re: [conntrack-tools PATCH] Makefile.am: Use ${} instead of @...@

[Arturo Borrero Gonzalez]

On 11/11/19 6:19 PM, Phil Sutter wrote:
> Referencing to variables using @...@ means they will be replaced by
> configure. This is not needed and may cause problems later.
> 
> Suggested-by: Jan Engelhardt <jengelh@inai.de>
> Signed-off-by: Phil Sutter <phil@nwl.cc>
> ---
>  Makefile.am             | 2 +-
>  src/Makefile.am         | 2 +-
>  src/helpers/Makefile.am | 4 ++--
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 

Acked-by: Arturo Borrero Gonzalez <arturo@netfilter.org>

Re: [conntrack-tools PATCH] Makefile.am: Use ${} instead of @...@

[Pablo Neira Ayuso]

On Mon, Nov 11, 2019 at 06:19:21PM +0100, Phil Sutter wrote:
> Referencing to variables using @...@ means they will be replaced by
> configure. This is not needed and may cause problems later.
> 
> Suggested-by: Jan Engelhardt <jengelh@inai.de>
> Signed-off-by: Phil Sutter <phil@nwl.cc>

Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>