diff options
| author | wiz <wiz@pkgsrc.org> | 2011-04-07 08:08:45 +0000 |
|---|---|---|
| committer | wiz <wiz@pkgsrc.org> | 2011-04-07 08:08:45 +0000 |
| commit | 11d5907f045907049da99d762c00931a1fe4a20a (patch) | |
| tree | fe624e17622e9650161390c1cf98e9789f83c84c /mk/bsd.prefs.mk | |
| parent | 259d383da0ff8968483d247c06ffd13f2fe5553c (diff) | |
| download | pkgsrc-11d5907f045907049da99d762c00931a1fe4a20a.tar.gz | |
Make USE_DESTDIR=yes default, and warn if a package is not converted
to destdir yet. Based on a patch by Greg Troxel.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 12737fd67c7..64698601629 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.313 2011/01/31 08:18:44 sbd Exp $ +# $NetBSD: bsd.prefs.mk,v 1.314 2011/04/07 08:08:45 wiz Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -424,12 +424,9 @@ do-install: @${DO_NADA} .endif -# PKG_DESTDIR_SUPPORT can only be one of "destdir" or "user-destdir". -.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no" +# After 2011Q1, the default is to use DESTDIR. USE_DESTDIR?= yes -.else -USE_DESTDIR?= no -.endif +# PKG_DESTDIR_SUPPORT can only be one of "destdir" or "user-destdir". PKG_DESTDIR_SUPPORT?= # empty .if empty(PKG_DESTDIR_SUPPORT) || empty(USE_DESTDIR:M[Yy][Ee][Ss]) @@ -445,7 +442,9 @@ _USE_DESTDIR= destdir PKG_FAIL_REASON+= "PKG_DESTDIR_SUPPORT must be \`\`destdir'' or \`\`user-destdir''." .endif -.if defined(PKG_DEVELOPER) && ${PKG_DEVELOPER} != "no" && empty(PKG_DESTDIR_SUPPORT) +# This stanza serves to warn the user; deciding to not build +# non-DESTDIR-capable packages when not in DESTDIR mode is above. +.if empty(PKG_DESTDIR_SUPPORT) WARNINGS+= "[bsd.prefs.mk] The package ${PKGNAME} is missing DESTDIR support." .endif |