diff options
| author | joerg <joerg@pkgsrc.org> | 2009-05-09 14:59:08 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-05-09 14:59:08 +0000 |
| commit | 39688c1a79010e20c14b5b131c822d28a636a368 (patch) | |
| tree | 8e5d9e2f6429934f4c78445c3e4a4b2db4e1e7ef /mk | |
| parent | f5d7693945f784276c90e71e23611f014980911e (diff) | |
| download | pkgsrc-39688c1a79010e20c14b5b131c822d28a636a368.tar.gz | |
Make USE_DESTDIR=full the default value and retire the option.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 13 | ||||
| -rw-r--r-- | mk/help/destdir.help | 10 |
2 files changed, 12 insertions, 11 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index da42d819ad1..7c5002c80d1 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.290 2009/04/08 23:03:14 joerg Exp $ +# $NetBSD: bsd.prefs.mk,v 1.291 2009/05/09 14:59:08 joerg Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -381,14 +381,15 @@ do-install: USE_DESTDIR?= no PKG_DESTDIR_SUPPORT?= # empty -.if empty(PKG_DESTDIR_SUPPORT) || (empty(USE_DESTDIR:M[Yy][Ee][Ss]) && empty(USE_DESTDIR:M[Ff][Uu][Ll][Ll])) +.if !empty(USE_DESTDIR:M[Ff][Uu][Ll][Ll]) +WARNINGS+= "USE_DESTDIR=full is deprecated, just use USE_DESTDIR=yes" +USE_DESTDIR:= yes +.endif + +.if empty(PKG_DESTDIR_SUPPORT) || empty(USE_DESTDIR:M[Yy][Ee][Ss]) _USE_DESTDIR= no .elif ${PKG_DESTDIR_SUPPORT} == "user-destdir" -. if !empty(USE_DESTDIR:M[Ff][Uu][Ll][Ll]) _USE_DESTDIR= user-destdir -. else -_USE_DESTDIR= destdir -. endif .elif ${PKG_DESTDIR_SUPPORT} == "destdir" _USE_DESTDIR= destdir .else diff --git a/mk/help/destdir.help b/mk/help/destdir.help index 44871136ccb..d7e77c794ec 100644 --- a/mk/help/destdir.help +++ b/mk/help/destdir.help @@ -1,4 +1,4 @@ -# $NetBSD: destdir.help,v 1.3 2008/08/10 17:39:15 joerg Exp $ +# $NetBSD: destdir.help,v 1.4 2009/05/09 14:59:08 joerg Exp $ # # === # Warning: This file is still under construction. Don't rely on it. @@ -20,10 +20,10 @@ # # USE_DESTDIR # * "yes" to enable DESTDIR support for those packages that -# explicitly support it. -# -# * "full": This makes the build completely unprivileged and in -# turn detects any attempt to write e.g. to ${LOCALBASE}. +# explicitly support it. If the package supports it, +# the build will run completely under the privileges of the +# calling users, only package installation via pkg_add is done +# as root. # # === Package-settable variables === # |