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

diff --git a/Makefile b/Makefile
index 7bdf879c22d35613cff78a0ffb19828e53a04c80..6d3730caf5ceacae19b22f16997f27f2cd43ca59 100644 (file)
--- 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 0de0ae1a7eec5ef8db6226b9dd35f69bed901b29..c1e88c0a33e8bbcd8a822083044c8b3d5cfb2645 100644 (file)
--- 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