Incase CFLAGS is set, we should still set std

diff --git a/Makefile b/Makefile
index f8d2438ba1ea3346cce4c1b6bf67ac526f441c0d..0669cfbb747164aa72892da3b587101e6299ea0a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -7,8 +7,8 @@ SRCS+=          dhcp-common.c
 
 CFLAGS?=       -O2
 CSTD?=         c99
-CFLAGS+=       -std=${CSTD}
 include config.mk
+CFLAGS+=       -std=${CSTD}
 
 OBJS+=         ${SRCS:.c=.o} ${COMPAT_SRCS:.c=.o}
 

diff --git a/configure b/configure
index 8bcf1da340889c3d70913b8707674a3a043cfad1..523fc03c202e8c5b8751b01f7abc0b00a4dc7300 100755 (executable)
--- a/configure
+++ b/configure
@@ -264,8 +264,8 @@ echo "CC=           $CC" >>$CONFIG_MK
 if [ -n "$CFLAGS" ]; then
        echo "CFLAGS=           $CFLAGS" >>$CONFIG_MK
 fi
-if [ -n "$CPPLAGS" ]; then
-       echo "CPPLAGS=          $CPPLAGS" >>$CONFIG_MK
+if [ -n "$CPPFLAGS" ]; then
+       echo "CPPFLAGS=         $CPPFLAGS" >>$CONFIG_MK
 fi
 if [ -n "$LDFLAGS" ]; then
        echo "LDFLAGS=          $LDFLAGS" >>$CONFIG_MK