diff options
| author | joerg <joerg> | 2008-04-07 13:31:15 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2008-04-07 13:31:15 +0000 |
| commit | 79c7c217f7c3b15a0ed72b795061a4b33e4e9999 (patch) | |
| tree | 7618ceac5e0022dc87296b9c6be33f22c12a09eb | |
| parent | 9465e9c3d95e59ef534413b87994f2a2fb1a64a0 (diff) | |
| download | pkgsrc-79c7c217f7c3b15a0ed72b795061a4b33e4e9999.tar.gz | |
Prefer package-destdir as default for update with USE_DESTDIR.
| -rw-r--r-- | mk/bsd.pkg.update.mk | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/mk/bsd.pkg.update.mk b/mk/bsd.pkg.update.mk index fa79d2f2d6a..b96341abb0a 100644 --- a/mk/bsd.pkg.update.mk +++ b/mk/bsd.pkg.update.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.update.mk,v 1.14 2008/02/07 21:36:13 rillig Exp $ +# $NetBSD: bsd.pkg.update.mk,v 1.15 2008/04/07 13:31:15 joerg Exp $ # # This Makefile fragment is included by bsd.pkg.mk and contains the targets # and variables for "make update". @@ -16,7 +16,9 @@ REINSTALL?= NO # reinstall upon update # .if !defined(UPDATE_TARGET) . if defined(DEPENDS_TARGET) && (${DEPENDS_TARGET} == "update") -. if make(package) +. if ${_USE_DESTDIR} != "no" +UPDATE_TARGET= package-install +. elif make(package) UPDATE_TARGET= package . else UPDATE_TARGET= install |