diff options
| author | joerg <joerg@pkgsrc.org> | 2010-02-25 02:06:34 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2010-02-25 02:06:34 +0000 |
| commit | de6f00a990d177c6a7de363b6e05ae7a1d8472af (patch) | |
| tree | a25ba3359abf69456539d14dba503f754d91fa6c /mk | |
| parent | 64a32682ffd784fd8874f48259f12f7be990f392 (diff) | |
| download | pkgsrc-de6f00a990d177c6a7de363b6e05ae7a1d8472af.tar.gz | |
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 (limited to 'mk')
| -rw-r--r-- | mk/depends/bsd.depends.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mk/depends/bsd.depends.mk b/mk/depends/bsd.depends.mk index 06a0c2cbec3..060013b750f 100644 --- a/mk/depends/bsd.depends.mk +++ b/mk/depends/bsd.depends.mk @@ -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 @@ SKIP_DEPENDS?= no # 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} |