1From 4848b9e4d516a9203c08432901a7b40419e8f43c Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Wed, 19 Jul 2017 15:54:35 -0700
4Subject: [PATCH 1/3] Respect flags from env
5
6Signed-off-by: Khem Raj <raj.khem@gmail.com>
7---
8 Makefile      | 4 ++--
9 cli/Makefile  | 2 +-
10 pppd/Makefile | 2 +-
11 3 files changed, 4 insertions(+), 4 deletions(-)
12
13diff --git a/Makefile b/Makefile
14index a05a000..439a978 100644
15--- a/Makefile
16+++ b/Makefile
17@@ -81,8 +81,8 @@ LIBS.dmalloc=		-ldmalloc
18 export USE_DMALLOC
19 endif
20
21-CPPFLAGS=		$(CPPFLAGS.ippooltest)
22-CFLAGS=			-I. -Iusl -Icli -MMD -Wall -g $(CPPFLAGS) $(CPPFLAGS.dmalloc)
23+CPPFLAGS+=		$(CPPFLAGS.ippooltest)
24+CFLAGS+=			-I. -Iusl -Icli -MMD -Wall -g $(CPPFLAGS) $(CPPFLAGS.dmalloc)
25 LDFLAGS.ippoold=	$(LDFLAGS) -Wl,-E -L. -Lusl -lusl -lnsl -ldl $(LIBS.dmalloc) -lc
26 LDFLAGS.ippoolconfig=	$(LDFLAGS) -Lcli -lcli -lreadline -lcurses -lnsl $(LIBS.dmalloc) -lc
27
28diff --git a/cli/Makefile b/cli/Makefile
29index 4b5dd59..56fbf2f 100644
30--- a/cli/Makefile
31+++ b/cli/Makefile
32@@ -7,7 +7,7 @@ CLI_SRCS_TEST.o=	$(CLI_SRCS_TEST.c:%.c=%.o)
33
34 LDFLAGS.cli_test=	-L.. -L. $(READLINE_LDFLAGS) -lcli -lusl -lreadline -lcurses -lc
35
36-CFLAGS=			$(CFLAGS.optimize) -MMD -Wall -Werror -I.. $(READLINE_CFLAGS)
37+CFLAGS=			$(CFLAGS.optimize) -MMD -Wall -Werror -I.. $(READLINE_CFLAGS) $(CPPFLAGS)
38
39 .PHONY:			all test clean
40
41diff --git a/pppd/Makefile b/pppd/Makefile
42index 106deca..7fd815f 100644
43--- a/pppd/Makefile
44+++ b/pppd/Makefile
45@@ -10,7 +10,7 @@ endif
46
47 # END CONFIGURABLE SETTINGS
48
49-CFLAGS	+= -g -I.. -I/usr/include/pppd $(CFLAGS.pppd) -fPIC
50+CFLAGS	+= -g -I.. -I=/usr/include/pppd $(CFLAGS.pppd) -fPIC
51 LDFLAGS	+= -shared
52
53 all:	ippool.so
54--
552.13.3
56
57