summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2014-02-03 13:09:13 +0000
committerRoy Marples <roy@marples.name>2014-02-03 13:09:13 +0000
commit90ada440ecae51f1041e16e54d86f1add7d6d72f (patch)
treea29261444b60d512cca528febbe383151c480971 /Makefile
parent2d468029e193f44742c48859aa5bcf383511b9c0 (diff)
downloaddhcpcd-90ada440ecae51f1041e16e54d86f1add7d6d72f.tar.xz
Fix make import with compat sources.
Use -lmd for MD5 if available.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile10
1 files changed, 6 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index c672f235..34db686e 100644
--- a/Makefile
+++ b/Makefile
@@ -161,7 +161,9 @@ import: ${SRCS}
sort -u) /tmp/${DISTPREFIX}; \
if test -n "${CRYPT_SRCS}"; then \
${INSTALL} -d /tmp/${DISTPREFIX}/crypt; \
- cp crypt/${CRYPT_SRCS} /tmp/${DISTPREFIX}/crypt; \
+ cp $$(echo ${CRYPT_SRCS} | tr ' ' '\n' | \
+ sed -e 's:^:crypt/:g') \
+ /tmp/${DISTPREFIX}/crypt; \
cp $$(cd crypt && ${CC} ${CPPFLAGS} -MM ${CRYPT_SRCS} | \
sed -e 's/^.*c //g' -e 's/.*\.c$$//g' -e 's/\\//g' | \
tr ' ' '\n' | sed -e 's:^:crypt/:g' | \
@@ -169,10 +171,10 @@ import: ${SRCS}
fi;
if test -n "${COMPAT_SRCS}"; then \
${INSTALL} -d /tmp/${DISTPREFIX}/compat; \
- cp compat/${COMPAT_SRCS} /tmp/${DISTPREFIX}/compat; \
- cp $$(cd compat && ${CC} ${CPPFLAGS} -MM ${COMPAT_SRCS} | \
+ cp ${COMPAT_SRCS} /tmp/${DISTPREFIX}/compat; \
+ cp $$(${CC} ${CPPFLAGS} -MM ${COMPAT_SRCS} | \
sed -e 's/^.*c //g' -e 's/.*\.c$$//g' -e 's/\\//g' | \
- tr ' ' '\n' | sed -e 's:^:compat/:g' | \
+ tr ' ' '\n' | \
sort -u) /tmp/${DISTPREFIX}/compat; \
fi;
if test -n "${IMPORT_RCSID}"; then \