1Fix quoting for BUILD_WITH
2
3The escaped quotes are to make the -D values produce strings which
4can be used to display these values. However, if the values are more
5than one word, with spaces, they also need shell quoting to make them
6into single words.
7
8Upstream-Status: Pending
9
10Signed-off-by: Peter Seebach <peter.seebach@windriver.com>
11Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
12---
13 src/main/libfreeradius-server.mk    | 2 +-
14 src/main/unittest.mk                | 2 +-
15 src/modules/rlm_eap/radeapclient.mk | 2 +-
16 3 files changed, 3 insertions(+), 3 deletions(-)
17
18diff --git a/src/main/libfreeradius-server.mk b/src/main/libfreeradius-server.mk
19index 4495f72..07c28f1 100644
20--- a/src/main/libfreeradius-server.mk
21+++ b/src/main/libfreeradius-server.mk
22@@ -18,5 +18,5 @@ SOURCES	:=	conffile.c \
23 TGT_LDLIBS      := $(OPENSSL_LIBS)
24
25 ifneq ($(MAKECMDGOALS),scan)
26-SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
27+SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS="\"$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS="\"$(LDFLAGS)\"" -DBUILT_WITH_LIBS="\"$(LIBS)\""
28 endif
29diff --git a/src/main/unittest.mk b/src/main/unittest.mk
30index 09f3938..ed33952 100644
31--- a/src/main/unittest.mk
32+++ b/src/main/unittest.mk
33@@ -21,5 +21,5 @@ TGT_PREREQS	+= libfreeradius-eap.a
34 endif
35
36 ifneq ($(MAKECMDGOALS),scan)
37-SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
38+SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS="\"$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS="\"$(LDFLAGS)\"" -DBUILT_WITH_LIBS="\"$(LIBS)\""
39 endif
40diff --git a/src/modules/rlm_eap/radeapclient.mk b/src/modules/rlm_eap/radeapclient.mk
41index 6068f54..7d3c556 100644
42--- a/src/modules/rlm_eap/radeapclient.mk
43+++ b/src/modules/rlm_eap/radeapclient.mk
44@@ -23,7 +23,7 @@ SRC_CFLAGS += -DWITH_EAPCLIENT
45 SRC_INCDIRS  := ${top_srcdir}/src/modules/rlm_eap/libeap
46
47 ifneq ($(MAKECMDGOALS),scan)
48-SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS=\"$(CPPFLAGS)\" -DBUILT_WITH_CFLAGS=\"$(CFLAGS)\" -DBUILT_WITH_LDFLAGS=\"$(LDFLAGS)\" -DBUILT_WITH_LIBS=\"$(LIBS)\"
49+SRC_CFLAGS	+= -DBUILT_WITH_CPPFLAGS="\"$(CPPFLAGS)\"" -DBUILT_WITH_CFLAGS="\"$(CFLAGS)\"" -DBUILT_WITH_LDFLAGS="\"$(LDFLAGS)\"" -DBUILT_WITH_LIBS="\"$(LIBS)\""
50 endif
51
52 endif
53--
542.10.2
55
56