We should really be using CPPFLAGS.

diff --git a/Makefile b/Makefile
index 4c8a2c2d742fdf6fb4d701542e98be91110c199b..bbf1d14922256e460183d75c9a7ff3bef2ed986a 100644 (file)
--- 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 80e846ede10c34df64f133dcf9333eaa1213dd13..b127c39e4868ce6fd28fc4ef494316505e6ba7d7 100644 (file)
--- 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}