Mercurial > hg > dhcpcd

changeset 2615:83fb7cf4a418 draft

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix import so that matching system vs local headers are not imported.
author Roy Marples <roy@marples.name>
date Wed, 30 Jul 2014 10:58:20 +0000
parents 2f50d9275b82
children f678f2da7801
files Makefile crypt/hmac_md5.c
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Wed Jul 30 10:03:14 2014 +0000
+++ b/Makefile	Wed Jul 30 10:58:20 2014 +0000
@@ -147,7 +147,7 @@
 	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 @@
 	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 @@
 	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; \
--- a/crypt/hmac_md5.c	Wed Jul 30 10:03:14 2014 +0000
+++ b/crypt/hmac_md5.c	Wed Jul 30 10:58:20 2014 +0000
@@ -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