summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mk/bsd.pkg.update.mk4
-rw-r--r--mk/depends/bsd.depends.mk4
2 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.pkg.update.mk b/mk/bsd.pkg.update.mk
index 1d0fe46408e..5f9a6742850 100644
--- a/mk/bsd.pkg.update.mk
+++ b/mk/bsd.pkg.update.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.update.mk,v 1.22 2010/07/03 04:24:14 darcy Exp $
+# $NetBSD: bsd.pkg.update.mk,v 1.23 2011/05/04 09:49:34 obache Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and contains the targets
# and variables for "make update".
@@ -16,7 +16,7 @@ REINSTALL?= NO # reinstall upon update
#
.if !defined(UPDATE_TARGET)
. if defined(DEPENDS_TARGET) && (${DEPENDS_TARGET} == "update")
-. if ${_USE_DESTDIR} != "no" || make(package)
+. if ${_USE_DESTDIR} != "no" || make(package) || make(package-install)
UPDATE_TARGET= package-install
. else
UPDATE_TARGET= install
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk
index 060013b750f..6ddd2b1c992 100644
--- a/mk/depends/bsd.depends.mk
+++ b/mk/depends/bsd.depends.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.depends.mk,v 1.20 2010/02/25 02:06:34 joerg Exp $
+# $NetBSD: bsd.depends.mk,v 1.21 2011/05/04 09:49:34 obache Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and provides all
# variables and targets related to dependencies.
@@ -22,7 +22,7 @@ SKIP_DEPENDS?= no
# dependencies. This variable is user-settable in /etc/mk.conf.
#
.if !defined(DEPENDS_TARGET)
-. if !empty(USE_DESTDIR:M[Yy][Ee][Ss]) || make(package)
+. if !empty(USE_DESTDIR:M[Yy][Ee][Ss]) || make(package) || make(package-install)
DEPENDS_TARGET= package-install
. elif make(update)
. if defined(UPDATE_TARGET) && (${UPDATE_TARGET} == "replace")