build: import-src now works with DESTDIR

diff --git a/Makefile b/Makefile
index 1a1d5b0ba3b544df3762523aeb3a56cfddaaec7d..deff77b5ddfba223e031d44de4eabe3ceebd1209 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -91,10 +91,16 @@ import: dist
        ${INSTALL} -d /tmp/${DISTPREFIX}
        tar xvJpf ${DISTFILE} -C /tmp
 
+_import-src:
+       rm -rf ${DESTDIR}/*
+       ${INSTALL} -d ${DESTDIR}
+       cp LICENSE README.md ${DESTDIR};
+       for x in ${SUBDIRS}; do cd $$x; ${MAKE} DESTDIR=${DESTDIR} $@ || exit $$?; cd ..; done
+       @${ECHO}
+       @${ECHO} "============================================================="
+       @${ECHO} "dhcpcd-${VERSION} imported to ${DESTDIR}"
+
 import-src:
-       rm -rf /tmp/${DISTPREFIX}
-       ${INSTALL} -d /tmp/${DISTPREFIX}
-       cp LICENSE README.md /tmp/${DISTPREFIX}
-       for x in ${SUBDIRS}; do cd $$x; ${MAKE} DESTDIR=/tmp/${DISTPREFIX} $@ || exit $$?; cd ..; done
+       ${MAKE} _import-src DESTDIR=`if [ -n "${DESTDIR}" ]; then echo "${DESTDIR}"; else  echo /tmp/${DISTPREFIX}; fi`
 
 include Makefile.inc

diff --git a/hooks/Makefile b/hooks/Makefile
index 152806e7da6fcc14ad6438b0ab379e9d5d6a49f0..e8fb70a8b47d378b5780ebae44ef62afed0ab5dd 100644 (file)
--- a/hooks/Makefile
+++ b/hooks/Makefile
@@ -61,7 +61,7 @@ import: ${HOOKSCRIPTS}
        ${INSTALL} -m ${NONBINMODE} ${SCRIPTS} /tmp/${DISTPREFIX}/dhcpcd-hooks
        ${INSTALL} -m ${NONBINMODE} ${FILES} /tmp/${DISTPREFIX}/dhcpcd-hooks
 
-import-src:
+_import-src:
        ${INSTALL} -d ${DESTDIR}/hooks
        cp dhcpcd-run-hooks.in dhcpcd-run-hooks.8.in [0-9]* ${DESTDIR}/hooks
        rm ${DESTDIR}/hooks/50-dhcpcd-compat

diff --git a/src/Makefile b/src/Makefile
index 2811714d8cd66e42edce6bba887dae6333570c98..7f7317d5d445f6c7a629fe4406a0bdac12f88a96 100644 (file)
--- a/src/Makefile
+++ b/src/Makefile
@@ -135,7 +135,7 @@ clean:
 distclean: clean
        rm -f .depend
 
-import-src: ${SRCS}
+_import-src: ${SRCS}
        ${INSTALL} -d ${DESTDIR}/src
        touch if-bsd.h if-linux.h if-sun.h
        cp defs.h ${SRCS} ${SRCS:.c=.h} dev.h ${MAN5}.in ${MAN8}.in ${DESTDIR}/src