diff options
| author | joerg <joerg@pkgsrc.org> | 2006-10-09 11:44:06 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2006-10-09 11:44:06 +0000 |
| commit | 977a821a8f7eb4013b29e47f7fb3c63850d539d3 (patch) | |
| tree | 81c92137461e47b6011bb2bbce71f9efb874c327 /mk/package | |
| parent | c0ec39a99b04626a7254147f7da70ee37804f2b6 (diff) | |
| download | pkgsrc-977a821a8f7eb4013b29e47f7fb3c63850d539d3.tar.gz | |
Add two variables to control whether make package and make clean
are run with elevated privileges. Remove MAKE_PACKAGE_AS_ROOT
for now, since it is not sure whether the functionality in the current
form will stay and developers should spend time on the destdir support
instead.
Diffstat (limited to 'mk/package')
| -rw-r--r-- | mk/package/bsd.package.mk | 16 | ||||
| -rw-r--r-- | mk/package/package.mk | 8 |
2 files changed, 5 insertions, 19 deletions
diff --git a/mk/package/bsd.package.mk b/mk/package/bsd.package.mk index 91f4d112675..4cf693056ca 100644 --- a/mk/package/bsd.package.mk +++ b/mk/package/bsd.package.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.package.mk,v 1.8 2006/10/08 20:31:38 rillig Exp $ +# $NetBSD: bsd.package.mk,v 1.9 2006/10/09 11:44:07 joerg Exp $ # # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to binary packages. @@ -6,20 +6,6 @@ # The following are the "public" targets provided by this module: # # package, repackage -# -# The following variables may be set by the package: -# -# MAKE_PACKAGE_AS_ROOT: YesNo -# When this variable is set to "no", the package is created by -# the user that also built the package. Since most packages don't -# need root privileges to create the package, the default value -# is "no". Packages that install unreadable files (for example -# with mode 4111) need to set this variable to "yes". -# -# Default value: "yes", but this will change to "no" after most -# packages that really need this option have been identified. - -MAKE_PACKAGE_AS_ROOT?= yes _COOKIE.package= ${WRKDIR}/.package_done diff --git a/mk/package/package.mk b/mk/package/package.mk index 8b4920b4d13..d3a9ca63530 100644 --- a/mk/package/package.mk +++ b/mk/package/package.mk @@ -1,4 +1,4 @@ -# $NetBSD: package.mk,v 1.16 2006/10/08 20:31:38 rillig Exp $ +# $NetBSD: package.mk,v 1.17 2006/10/09 11:44:07 joerg Exp $ ###################################################################### ### package (PUBLIC) @@ -83,12 +83,12 @@ _PACKAGE_ALL_TARGETS+= package-warnings _PACKAGE_ALL_TARGETS+= error-check .PHONY: package-all su-package-all -.if !empty(MAKE_PACKAGE_AS_ROOT:M[Yy][Ee][Ss]) +.if !empty(_MAKE_PACKAGE_AS_ROOT:M[Yy][Ee][Ss]) package-all: su-target -su-package-all: ${_PACKAGE_ALL_TARGETS} .else -package-all: ${_PACKAGE_ALL_TARGETS} +package-all: su-package-all .endif +su-package-all: ${_PACKAGE_ALL_TARGETS} ###################################################################### ### package-check-installed (PRIVATE, override) |