summaryrefslogtreecommitdiff
path: root/mk/flavor
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2006-06-05 17:21:54 +0000
committerjlam <jlam@pkgsrc.org>2006-06-05 17:21:54 +0000
commitaa5856070f1517f547ccd00f346baba70a5effcd (patch)
tree3cfc4837c05b7069180938908a35d1e34ab54109 /mk/flavor
parented8841d0fdf382d6b115bce9d7ccb632e0ac0d12 (diff)
downloadpkgsrc-aa5856070f1517f547ccd00f346baba70a5effcd.tar.gz
Move definitions for UPDATE_TARGET and DEPENDS_TARGET closer to where
they are used. Also, move UPDATE_RUNNING into the install module where it is used, and make it "private" by prepending with an underscore.
Diffstat (limited to 'mk/flavor')
-rw-r--r--mk/flavor/pkg/deinstall.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/flavor/pkg/deinstall.mk b/mk/flavor/pkg/deinstall.mk
index f092c57a84f..08c9752361e 100644
--- a/mk/flavor/pkg/deinstall.mk
+++ b/mk/flavor/pkg/deinstall.mk
@@ -1,4 +1,4 @@
-# $NetBSD: deinstall.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $
+# $NetBSD: deinstall.mk,v 1.2 2006/06/05 17:21:55 jlam Exp $
# Set the appropriate flags to pass to pkg_delete(1) based on the value
# of DEINSTALLDEPENDS (see pkgsrc/mk/install/deinstall.mk).
@@ -18,7 +18,7 @@ _PKG_ARGS_DEINSTALL+= -v
.endif
.if defined(PKG_PRESERVE)
-. if !empty(UPDATE_RUNNING:M[yY][eE][sS])
+. if defined(_UPDATE_RUNNING) && !empty(_UPDATE_RUNNING:M[yY][eE][sS])
_PKG_ARGS_DEINSTALL+= -N -f # update w/o removing any files
. endif
.endif