[pkgsrc/trunk]: pkgsrc/mk/depends Simplify conditional as USE_DESTDIR is set ...

[joerg <joerg%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/df7e00dc5a28
branches:  trunk
changeset: 572380:df7e00dc5a28
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 25 02:06:34 2010 +0000

description:
Simplify conditional as USE_DESTDIR is set by bsd.prefs.mk.
For "make package", always use package-install as dependency target by
default. This matters if USE_DESTDIR is set conditionally.

diffstat:

 mk/depends/bsd.depends.mk |  6 ++----
 1 files changed, 2 insertions(+), 4 deletions(-)

diffs (21 lines):

diff -r a84c18a626b8 -r df7e00dc5a28 mk/depends/bsd.depends.mk
--- a/mk/depends/bsd.depends.mk Thu Feb 25 01:03:44 2010 +0000
+++ b/mk/depends/bsd.depends.mk Thu Feb 25 02:06:34 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.depends.mk,v 1.19 2010/02/20 12:49:48 obache Exp $
+# $NetBSD: bsd.depends.mk,v 1.20 2010/02/25 02:06:34 joerg Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to dependencies.
@@ -22,10 +22,8 @@
 # dependencies.  This variable is user-settable in /etc/mk.conf.
 #
 .if !defined(DEPENDS_TARGET)
-.  if defined(USE_DESTDIR) && !empty(USE_DESTDIR:M[Yy][Ee][Ss])
+.  if !empty(USE_DESTDIR:M[Yy][Ee][Ss]) || make(package)
 DEPENDS_TARGET=                package-install
-.  elif make(package)
-DEPENDS_TARGET=                package
 .  elif make(update)
 .    if defined(UPDATE_TARGET) && (${UPDATE_TARGET} == "replace")
 DEPENDS_TARGET=                ${UPDATE_TARGET}