pkgsrc-Changes-HG archive

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

[pkgsrc/trunk]: pkgsrc/mk If using "make package", default to recursion with ...



details:   https://anonhg.NetBSD.org/pkgsrc/rev/4eef753b3832
branches:  trunk
changeset: 572381:4eef753b3832
user:      joerg <joerg%pkgsrc.org@localhost>
date:      Thu Feb 25 02:08:33 2010 +0000

description:
If using "make package", default to recursion with package-install.

diffstat:

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

diffs (21 lines):

diff -r df7e00dc5a28 -r 4eef753b3832 mk/bsd.pkg.update.mk
--- a/mk/bsd.pkg.update.mk      Thu Feb 25 02:06:34 2010 +0000
+++ b/mk/bsd.pkg.update.mk      Thu Feb 25 02:08:33 2010 +0000
@@ -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 @@
 #
 .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



Home | Main Index | Thread Index | Old Index