diff options
| author | joerg <joerg@pkgsrc.org> | 2016-04-10 15:33:42 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2016-04-10 15:33:42 +0000 |
| commit | b6b9f4a1e6d214b96f03df58daa363d33e5e9f93 (patch) | |
| tree | b9853de6c906914bb8be45dc00a16f15f14f18c9 /mk | |
| parent | b7a0117d77547966bf612966351f5a0f7e3a0043 (diff) | |
| download | pkgsrc-b6b9f4a1e6d214b96f03df58daa363d33e5e9f93.tar.gz | |
Adjust USRGROUP_PHASE handling for USE_DESTDIR=no removal. Update
documentation to reflect the pre-install option.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pkginstall/bsd.pkginstall.mk | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index baa5fd067a0..9ca7d4df7cb 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.64 2015/11/08 03:21:46 leot Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.65 2016/04/10 15:33:42 joerg Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -179,11 +179,11 @@ FILES_SUBST+= PKGBASE=${PKGBASE:Q} # # USERGROUP_PHASE is set to the phase just before which users and # groups need to be created. Valid values are "configure" and -# "build". If not defined, then by default users and groups -# are created prior to installation by the pre-install-script -# target. If this is defined, then the numeric UIDs and GIDs -# of users and groups required by this package are hardcoded -# into the +INSTALL script. +# "build" and "pre-install". +# If not defined, then by default users and groups are created +# as pare of the +INSTALL script. If this is defined, then +# the numeric UIDs and GIDs of users and groups required by this +# package are hardcoded into the +INSTALL script. # PKG_GROUPS?= # empty PKG_USERS?= # empty @@ -326,7 +326,7 @@ ${_INSTALL_USERGROUP_UNPACKER}: \ pre-configure: create-usergroup . elif !empty(USERGROUP_PHASE:M*build) pre-build: create-usergroup -. elif !empty(USERGROUP_PHASE:Mpre-install) && ${_USE_DESTDIR} != "no" +. elif !empty(USERGROUP_PHASE:Mpre-install) pre-install: create-usergroup . endif .endif |