pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/mk/depends Change default DEPENDS_TARGET to package-in...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/c4a2e0401d3a
branches:  trunk
changeset: 540616:c4a2e0401d3a
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Fri Apr 04 21:28:51 2008 +0000

description:
Change default DEPENDS_TARGET to package-install if USE_DESTDIR != no.
Discussed with jlam.

diffstat:

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

diffs (20 lines):

diff -r 6f0ffee08aa6 -r c4a2e0401d3a mk/depends/bsd.depends.mk
--- a/mk/depends/bsd.depends.mk Fri Apr 04 21:26:59 2008 +0000
+++ b/mk/depends/bsd.depends.mk Fri Apr 04 21:28:51 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.depends.mk,v 1.17 2008/02/20 10:43:55 rillig Exp $
+# $NetBSD: bsd.depends.mk,v 1.18 2008/04/04 21:28:51 joerg Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to dependencies.
@@ -22,7 +22,9 @@
 # dependencies.  This variable is user-settable in /etc/mk.conf.
 #
 .if !defined(DEPENDS_TARGET)
-.  if make(package)
+.  if ${_USE_DESTDIR} != "no"
+DEPENDS_TARGET=                package-install
+.  elif make(package)
 DEPENDS_TARGET=                package
 .  elif make(update)
 .    if defined(UPDATE_TARGET) && (${UPDATE_TARGET} == "replace")



Home | Main Index | Thread Index | Old Index