diff options
| -rw-r--r-- | mk/bsd.prefs.mk | 12 | ||||
| -rw-r--r-- | mk/help/destdir.help | 5 |
2 files changed, 10 insertions, 7 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index f132478dad5..c30935870bb 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.325 2012/07/27 09:44:31 jperkin Exp $ +# $NetBSD: bsd.prefs.mk,v 1.326 2012/08/14 15:27:07 asau Exp $ # # This file includes the mk.conf file, which contains the user settings. # @@ -432,10 +432,10 @@ do-install: # After 2011Q1, the default is to use DESTDIR. USE_DESTDIR?= yes -# PKG_DESTDIR_SUPPORT can only be one of "destdir" or "user-destdir". -PKG_DESTDIR_SUPPORT?= # empty +# PKG_DESTDIR_SUPPORT can only be one of "none", "destdir", or "user-destdir". +PKG_DESTDIR_SUPPORT?= none -.if empty(PKG_DESTDIR_SUPPORT) || empty(USE_DESTDIR:M[Yy][Ee][Ss]) +.if ${PKG_DESTDIR_SUPPORT} == "none" || empty(USE_DESTDIR:M[Yy][Ee][Ss]) . if empty(USE_DESTDIR:M[Yy][Ee][Ss]) && empty(USE_DESTDIR:M[Nn][Oo]) PKG_FAIL_REASON+= "USE_DESTDIR must be either \`\`yes'' or \`\`no''" . endif @@ -445,12 +445,12 @@ _USE_DESTDIR= user-destdir .elif ${PKG_DESTDIR_SUPPORT} == "destdir" _USE_DESTDIR= destdir .else -PKG_FAIL_REASON+= "PKG_DESTDIR_SUPPORT must be \`\`destdir'' or \`\`user-destdir''." +PKG_FAIL_REASON+= "PKG_DESTDIR_SUPPORT must be \`\`none'', \`\`destdir'', or \`\`user-destdir''." .endif # 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) +.if ${PKG_DESTDIR_SUPPORT} == "none" WARNINGS+= "[bsd.prefs.mk] The package ${PKGNAME} is missing DESTDIR support." .endif diff --git a/mk/help/destdir.help b/mk/help/destdir.help index b0b8b25f38b..f001046e1c3 100644 --- a/mk/help/destdir.help +++ b/mk/help/destdir.help @@ -1,4 +1,4 @@ -# $NetBSD: destdir.help,v 1.5 2010/02/24 22:53:34 joerg Exp $ +# $NetBSD: destdir.help,v 1.6 2012/08/14 15:27:07 asau Exp $ # # === # Warning: This file is still under construction. Don't rely on it. @@ -35,6 +35,9 @@ # ownership or permissions. The installation is done by the # privileged user. # +# * "none" means that all files of the packages will be installed +# by the privileged user. +# # This variable must be set before including bsd.prefs.mk directly or # indirectly. # |