diff options
| author | rh <rh@pkgsrc.org> | 2000-07-18 08:33:49 +0000 |
|---|---|---|
| committer | rh <rh@pkgsrc.org> | 2000-07-18 08:33:49 +0000 |
| commit | a15b9039db664fc491fca56eafa16eb7494c0896 (patch) | |
| tree | 9b7e989a4981fd8ebef33e001d870a234b7e0c64 /mk/bsd.pkg.mk | |
| parent | 54232daa5bc3beb26f1eae240e49b2f7f1579248 (diff) | |
| download | pkgsrc-a15b9039db664fc491fca56eafa16eb7494c0896.tar.gz | |
Fix clean-update target to remove ${DDIR} if it didn't exist before. This
prevents 'make update' from "resuming" an update that never even began.
Thus, a sequence of
make clean-update
make update
is now safe, no matter if 'make update' was started previously or not.
Diffstat (limited to 'mk/bsd.pkg.mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index b4b5002c363..aa05b8c3dd4 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.508 2000/07/18 08:21:41 rh Exp $ +# $NetBSD: bsd.pkg.mk,v 1.509 2000/07/18 08:33:49 rh Exp $ # # This file is in the public domain. # @@ -1902,12 +1902,14 @@ root-deinstall: .if exists(${DDIR}) RESUMEUPDATE?= YES +CLEAR_DIRLIST?= NO update: ${_PKG_SILENT}${_PKG_DEBUG}${ECHO_MSG} \ "${_PKGSRC_IN}> Resuming update for ${PKGNAME}" .else RESUMEUPDATE?= NO +CLEAR_DIRLIST?= YES update: ${_PKG_SILENT}${_PKG_DEBUG}${MAKE} ${MAKEFLAGS} ${DDIR} @@ -1954,7 +1956,7 @@ clean-update: fi) ; \ done ; \ fi -.ifdef CLEAR_DIRLIST +.if ${CLEAR_DIRLIST} != "NO" ${_PKG_SILENT}${_PKG_DEBUG}${MAKE} ${MAKEFLAGS} clean .else ${_PKG_SILENT}${_PKG_DEBUG} \ |