Permalink
Browse files

Also set `package-install' to UPDATE_TARGET/DEPENDS_TARGET if current…

… target is

`package-install', to indirect dependency also create binary package with
`make package' or `make package-install'.

should fix PR#44857.
  • Loading branch information...
1 parent 43a989d commit b45f75eb7ca473d692433599d9a64d1cf40cb50f obache committed May 4, 2011
Showing with 4 additions and 4 deletions.
  1. +2 −2 mk/bsd.pkg.update.mk
  2. +2 −2 mk/depends/bsd.depends.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
@@ -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")

0 comments on commit b45f75e

Please sign in to comment.