build: Allow DESTDIR to work for import as well.

1 files changed, 12 insertions, 12 deletions

diff --git a/Makefile b/Makefile
index deff77b5..dcd4624c 100644
--- a/Makefile
+++ b/Makefile
@@ -2,8 +2,7 @@ SUBDIRS=	src hooks
 
 VERSION!=	sed -n 's/\#define VERSION[[:space:]]*"\(.*\)".*/\1/p' src/defs.h
 
-DIST!=		if test -f .fslckout; then echo "dist-fossil"; \
-		elif test -d .git; then echo "dist-git"; \
+DIST!=		if test -d .git; then echo "dist-git"; \
 		else echo "dist-inst"; fi
 FOSSILID?=	current
 GITREF?=	HEAD
@@ -52,12 +51,6 @@ distclean: clean
 	rm -f config.h config.mk config.log \
 		${DISTFILE} ${DISTFILEGZ} ${DISTINFO} ${DISTINFOSIGN}
 
-
-dist-fossil:
-	fossil tarball --name ${DISTPREFIX} ${FOSSILID} ${DISTFILEGZ}
-	gunzip -c ${DISTFILEGZ} | xz >${DISTFILE}
-	rm ${DISTFILEGZ}
-
 dist-git:
 	git archive --prefix=${DISTPREFIX}/ ${GITREF} | xz >${DISTFILE}
 
@@ -86,10 +79,17 @@ snapshot:
 	tar cf - -C /tmp ${DISTPREFIX} | xz >${DISTFILE}
 	ls -l ${DISTFILE}
 
-import: dist
-	rm -rf /tmp/${DISTPREFIX}
-	${INSTALL} -d /tmp/${DISTPREFIX}
-	tar xvJpf ${DISTFILE} -C /tmp
+_import: dist
+	rm -rf ${DESTDIR}/*
+	${INSTALL} -d ${DESTDIR}
+	tar xvpf ${DISTFILE} -C ${DESTDIR} --strip 1
+	@${ECHO}
+	@${ECHO} "============================================================="
+	@${ECHO} "dhcpcd-${VERSION} imported to ${DESTDIR}"
+
+import:
+	${MAKE} _import DESTDIR=`if [ -n "${DESTDIR}" ]; then echo "${DESTDIR}"; else  echo /tmp/${DISTPREFIX}; fi`
+
 
 _import-src:
 	rm -rf ${DESTDIR}/*