summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2010-02-25 02:08:33 +0000
committerjoerg <joerg@pkgsrc.org>2010-02-25 02:08:33 +0000
commit428176d01d1cdea02237920f9bcfa3281eff8d23 (patch)
tree706c5d6a4cfb8d8f47d7e5154627d6bf262b3683 /mk
parentde6f00a990d177c6a7de363b6e05ae7a1d8472af (diff)
downloadpkgsrc-428176d01d1cdea02237920f9bcfa3281eff8d23.tar.gz
If using "make package", default to recursion with package-install.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.update.mk6
1 files changed, 2 insertions, 4 deletions
diff --git a/mk/bsd.pkg.update.mk b/mk/bsd.pkg.update.mk
index 2b7df9091f4..01c4ce24859 100644
--- a/mk/bsd.pkg.update.mk
+++ b/mk/bsd.pkg.update.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.update.mk,v 1.19 2010/02/19 14:27:36 joerg Exp $
+# $NetBSD: bsd.pkg.update.mk,v 1.20 2010/02/25 02:08:33 joerg Exp $
#
# This Makefile fragment is included by bsd.pkg.mk and contains the targets
# and variables for "make update".
@@ -16,10 +16,8 @@ REINSTALL?= NO # reinstall upon update
#
.if !defined(UPDATE_TARGET)
. if defined(DEPENDS_TARGET) && (${DEPENDS_TARGET} == "update")
-. if ${_USE_DESTDIR} != "no"
+. if ${_USE_DESTDIR} != "no" || make(package)
UPDATE_TARGET= package-install
-. elif make(package)
-UPDATE_TARGET= package
. else
UPDATE_TARGET= install
. endif