diff options
| author | joerg <joerg> | 2010-02-25 02:08:33 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2010-02-25 02:08:33 +0000 |
| commit | 1218416feaee2bde12658d9ccc090bba223774f0 (patch) | |
| tree | 706c5d6a4cfb8d8f47d7e5154627d6bf262b3683 | |
| parent | 5fde34690b75faeec43d655b2bf05a92ef7d7a6d (diff) | |
| download | pkgsrc-1218416feaee2bde12658d9ccc090bba223774f0.tar.gz | |
If using "make package", default to recursion with package-install.
| -rw-r--r-- | mk/bsd.pkg.update.mk | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/mk/bsd.pkg.update.mk b/mk/bsd.pkg.update.mk index 2b7df9091f4..01c4ce24859 100644 --- a/mk/bsd.pkg.update.mk +++ b/mk/bsd.pkg.update.mk @@ -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 @@ REINSTALL?= NO # reinstall upon update # .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 |