|
 |
716360 |
From 1de80cc4b7782179dc392ca17bbd309655b905b2 Mon Sep 17 00:00:00 2001
|
|
|
716360 |
From: Phil Sutter <phil@nwl.cc>
|
|
|
716360 |
Date: Mon, 11 Nov 2019 18:02:49 +0100
|
|
|
716360 |
Subject: [PATCH] Makefile.am: Use ${} instead of @...@
|
|
|
716360 |
|
|
|
716360 |
Referencing to variables using @...@ means they will be replaced by
|
|
|
716360 |
configure. This is not needed and may cause problems later.
|
|
|
716360 |
|
|
|
716360 |
Suggested-by: Jan Engelhardt <jengelh@inai.de>
|
|
|
716360 |
Signed-off-by: Phil Sutter <phil@nwl.cc>
|
|
|
716360 |
Acked-by: Arturo Borrero Gonzalez <arturo@netfilter.org>
|
|
|
716360 |
Acked-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
716360 |
(cherry picked from commit f09b07f26c2bc15f59e64cc393c003966d7ca217)
|
|
|
716360 |
---
|
|
|
716360 |
Makefile.am | 2 +-
|
|
|
716360 |
src/Makefile.am | 2 +-
|
|
|
716360 |
src/helpers/Makefile.am | 4 ++--
|
|
|
716360 |
3 files changed, 4 insertions(+), 4 deletions(-)
|
|
|
716360 |
|
|
|
716360 |
diff --git a/Makefile.am b/Makefile.am
|
|
|
716360 |
index f64d60438d411..df4c0cbf71664 100644
|
|
|
716360 |
--- a/Makefile.am
|
|
|
716360 |
+++ b/Makefile.am
|
|
|
716360 |
@@ -7,7 +7,7 @@ EXTRA_DIST = $(man_MANS) Make_global.am doc m4 tests
|
|
|
716360 |
|
|
|
716360 |
SUBDIRS = extensions src
|
|
|
716360 |
DIST_SUBDIRS = include src extensions
|
|
|
716360 |
-LIBS = @LIBNETFILTER_CONNTRACK_LIBS@
|
|
|
716360 |
+LIBS = $(LIBNETFILTER_CONNTRACK_LIBS)
|
|
|
716360 |
|
|
|
716360 |
dist-hook:
|
|
|
716360 |
rm -rf `find $(distdir)/doc -name *.orig`
|
|
|
716360 |
diff --git a/src/Makefile.am b/src/Makefile.am
|
|
|
716360 |
index a9a868596e69c..a5b918d951327 100644
|
|
|
716360 |
--- a/src/Makefile.am
|
|
|
716360 |
+++ b/src/Makefile.am
|
|
|
716360 |
@@ -35,7 +35,7 @@ if HAVE_CTHELPER
|
|
|
716360 |
nfct_LDADD += ${LIBNETFILTER_CTHELPER_LIBS}
|
|
|
716360 |
endif
|
|
|
716360 |
|
|
|
716360 |
-nfct_LDFLAGS = -export-dynamic @LAZY_LDFLAGS@
|
|
|
716360 |
+nfct_LDFLAGS = -export-dynamic ${LAZY_LDFLAGS}
|
|
|
716360 |
|
|
|
716360 |
conntrackd_SOURCES = alarm.c main.c run.c hash.c queue.c queue_tx.c rbtree.c \
|
|
|
716360 |
local.c log.c mcast.c udp.c netlink.c vector.c \
|
|
|
716360 |
diff --git a/src/helpers/Makefile.am b/src/helpers/Makefile.am
|
|
|
716360 |
index 51e2841a7646a..d851d313e6fea 100644
|
|
|
716360 |
--- a/src/helpers/Makefile.am
|
|
|
716360 |
+++ b/src/helpers/Makefile.am
|
|
|
716360 |
@@ -10,7 +10,7 @@ pkglib_LTLIBRARIES = ct_helper_amanda.la \
|
|
|
716360 |
ct_helper_sane.la \
|
|
|
716360 |
ct_helper_ssdp.la
|
|
|
716360 |
|
|
|
716360 |
-HELPER_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) @LAZY_LDFLAGS@
|
|
|
716360 |
+HELPER_LDFLAGS = -avoid-version -module $(LIBNETFILTER_CONNTRACK_LIBS) $(LAZY_LDFLAGS)
|
|
|
716360 |
HELPER_CFLAGS = $(AM_CFLAGS) $(LIBNETFILTER_CONNTRACK_CFLAGS)
|
|
|
716360 |
|
|
|
716360 |
ct_helper_amanda_la_SOURCES = amanda.c
|
|
|
716360 |
@@ -31,7 +31,7 @@ ct_helper_mdns_la_CFLAGS = $(HELPER_CFLAGS)
|
|
|
716360 |
|
|
|
716360 |
ct_helper_rpc_la_SOURCES = rpc.c
|
|
|
716360 |
ct_helper_rpc_la_LDFLAGS = $(HELPER_LDFLAGS)
|
|
|
716360 |
-ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) @LIBTIRPC_CFLAGS@
|
|
|
716360 |
+ct_helper_rpc_la_CFLAGS = $(HELPER_CFLAGS) $(LIBTIRPC_CFLAGS)
|
|
|
716360 |
|
|
|
716360 |
ct_helper_tftp_la_SOURCES = tftp.c
|
|
|
716360 |
ct_helper_tftp_la_LDFLAGS = $(HELPER_LDFLAGS)
|
|
|
716360 |
--
|
|
|
716360 |
2.34.1
|
|
|
716360 |
|