From: Roy Marples <roy@marples.name>
Date: Wed, 30 Jul 2014 10:58:20 +0000 (+0000)
Subject: Fix import so that matching system vs local headers are not imported.
X-Git-Tag: v6.4.3~1
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a7d5172e5989bd4e633ff5cbf532f242e66b7a16;p=thirdparty%2Fdhcpcd.git

Fix import so that matching system vs local headers are not imported.
---

diff --git a/Makefile b/Makefile
index 7bdf879c..6d3730ca 100644
--- a/Makefile
+++ b/Makefile
@@ -147,7 +147,7 @@ import: ${SRCS}
 	rm -rf /tmp/${DISTPREFIX}
 	${INSTALL} -d /tmp/${DISTPREFIX}
 	cp ${SRCS} dhcpcd.conf dhcpcd-definitions.conf *.in /tmp/${DISTPREFIX}
-	cp $$(${CC} ${CPPFLAGS} -MM ${SRCS} | \
+	cp $$(${CC} ${CPPFLAGS} -DDEPGEN -MM ${SRCS} | \
 		sed -e 's/^.*\.c //g' -e 's/.*\.c$$//g' -e 's/\\//g' | \
 		tr ' ' '\n' | \
 		sed -e '/^compat\//d' | \
@@ -156,7 +156,7 @@ import: ${SRCS}
 	if test -n "${CRYPT_SRCS}"; then \
 		${INSTALL} -d /tmp/${DISTPREFIX}/crypt; \
 		cp ${CRYPT_SRCS} /tmp/${DISTPREFIX}/crypt; \
-		cp $$(${CC} ${CPPFLAGS} -MM ${CRYPT_SRCS} | \
+		cp $$(${CC} ${CPPFLAGS} -DDEPGEN -MM ${CRYPT_SRCS} | \
 			sed -e 's/^.*c //g' -e 's/.*\.c$$//g' -e 's/\\//g' | \
 			tr ' ' '\n' | sed -e '/\/\.\.\//d'  | \
 			sort -u) /tmp/${DISTPREFIX}/crypt; \
@@ -164,7 +164,7 @@ import: ${SRCS}
 	if test -n "${COMPAT_SRCS}"; then \
 		${INSTALL} -d /tmp/${DISTPREFIX}/compat; \
 		cp ${COMPAT_SRCS} /tmp/${DISTPREFIX}/compat; \
-		cp $$(${CC} ${CPPFLAGS} -MM ${COMPAT_SRCS} | \
+		cp $$(${CC} ${CPPFLAGS} -DDEPGEN -MM ${COMPAT_SRCS} | \
 			sed -e 's/^.*c //g' -e 's/.*\.c$$//g' -e 's/\\//g' | \
 			tr ' ' '\n' | \
 			sort -u) /tmp/${DISTPREFIX}/compat; \
diff --git a/crypt/hmac_md5.c b/crypt/hmac_md5.c
index 0de0ae1a..c1e88c0a 100644
--- a/crypt/hmac_md5.c
+++ b/crypt/hmac_md5.c
@@ -32,9 +32,11 @@
 
 #include "../config.h"
 #ifdef HAVE_MD5_H
-#include <md5.h>
+#  ifndef DEPGEN
+#    include <md5.h>
+#  endif
 #else
-#include "md5.h"
+#  include "md5.h"
 #endif
 
 #define HMAC_PAD_LEN	64