From: Roy Marples <roy@marples.name>
Date: Tue, 20 May 2008 05:57:35 +0000 (+0000)
Subject: We should really be using CPPFLAGS.
X-Git-Tag: v4.0.2~373
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8dc303abc8d09d9a8ec5dfc6bbc90dc31732196f;p=thirdparty%2Fdhcpcd.git

We should really be using CPPFLAGS.
---

diff --git a/Makefile b/Makefile
index 4c8a2c2d..bbf1d149 100644
--- a/Makefile
+++ b/Makefile
@@ -20,11 +20,8 @@ CLEANFILES+=	dhcpcd.sh
 FILES=		dhcpcd.conf
 FILESDIR=	${SYSCONFDIR}
 
-MK=		mk
-include ${MK}/prog.mk
-
-CFLAGS+=	-DSYSCONFDIR=\"${SYSCONFDIR}\"
-CFLAGS+=	-DDBDIR=\"${DBDIR}\"
+CPPFLAGS+=	-DSYSCONFDIR=\"${SYSCONFDIR}\"
+CPPFLAGS+=	-DDBDIR=\"${DBDIR}\"
 LDADD+=		${LIBRT}
 
 .SUFFIXES:	.in .sh.in
@@ -34,3 +31,6 @@ LDADD+=		${LIBRT}
 
 .sh.in.sh:
 	${SED} 's:@SYSCONFDIR@:${SYSCONFDIR}:g' $< > $@
+
+MK=		mk
+include ${MK}/prog.mk
diff --git a/mk/prog.mk b/mk/prog.mk
index 80e846ed..b127c39e 100644
--- a/mk/prog.mk
+++ b/mk/prog.mk
@@ -26,7 +26,7 @@ ${PROG}: ${OBJS}
 small: ${SRCS}
 	echo "" > _${PROG}.c
 	for src in ${SRCS}; do echo "#include \"$$src\"" >> _${PROG}.c; done
-	${CC} ${CFLAGS} -c _${PROG}.c -o _${PROG}.o
+	${CC} ${CPPFLAGS} -c _${PROG}.c -o _${PROG}.o
 	${CC} ${LDFLAGS} -o ${PROG} _${PROG}.o ${LDADD}
 
 _proginstall: ${PROG}