From: Roy Marples <roy@marples.name>
Date: Wed, 28 Aug 2019 19:35:27 +0000 (+0100)
Subject: build: import-src now works with DESTDIR
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=47cbb9f7b2a7b9cdebdda934e721f9d6c7f4f9aa;p=thirdparty%2Fdhcpcd.git

build: import-src now works with DESTDIR
---

diff --git a/Makefile b/Makefile
index 1a1d5b0b..deff77b5 100644
--- 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 152806e7..e8fb70a8 100644
--- 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 2811714d..7f7317d5 100644
--- 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