From: Roy Marples <roy@marples.name>
Date: Tue, 25 Jun 2013 09:04:10 +0000 (+0000)
Subject: Incase CFLAGS is set, we should still set std
X-Git-Tag: v6.0.2^0
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=64fd75d9a9dc9ad14e96cfa38292aa7d2c3c0c5c;p=thirdparty%2Fdhcpcd.git

Incase CFLAGS is set, we should still set std
---

diff --git a/Makefile b/Makefile
index f8d2438b..0669cfbb 100644
--- 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 8bcf1da3..523fc03c 100755
--- 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