diff options
| author | joerg <joerg> | 2010-06-15 19:23:55 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2010-06-15 19:23:55 +0000 |
| commit | 7f58fe1a2433abe67dd39dec92bbe2ae6940053e (patch) | |
| tree | 1d645e964ae7b59885171c3ff087140ec3e17a5d /mk | |
| parent | 12d16f259853ac980431f5ccb65b56c1ace07525 (diff) | |
| download | pkgsrc-7f58fe1a2433abe67dd39dec92bbe2ae6940053e.tar.gz | |
Allow pre-install for USERGROUP_PHASE. This is intended for
PKG_DESTDIR_SUPPORT=destdir packages, that don't otherwise need the
user/group during build.
Export USERGROUP_PHASE for the sake of pbulk.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/pbulk/pbulk-index.mk | 3 | ||||
| -rw-r--r-- | mk/pkginstall/bsd.pkginstall.mk | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/mk/pbulk/pbulk-index.mk b/mk/pbulk/pbulk-index.mk index dc5dfd214ba..bc48d37a978 100644 --- a/mk/pbulk/pbulk-index.mk +++ b/mk/pbulk/pbulk-index.mk @@ -1,4 +1,4 @@ -# $NetBSD: pbulk-index.mk,v 1.9 2008/06/19 18:36:51 joerg Exp $ +# $NetBSD: pbulk-index.mk,v 1.10 2010/06/15 19:23:55 joerg Exp $ # This Makefile fragment is included by bsd.pkg.mk and provides all # variables and targets related to the parallel bulk build @@ -94,6 +94,7 @@ pbulk-index-item: @echo "MAINTAINER="${MAINTAINER:Q} @echo "USE_DESTDIR="${_USE_DESTDIR:Q} @echo "BOOTSTRAP_PKG="${BOOTSTRAP_PKG} + @echo "USERGROUP_PHASE="${USERGROUP_PHASE:Q} .if defined(_PBULK_MULTI_NEEDED) @printf "MULTI_VERSION=" .for _t in ${_PBULK_MULTI_NEEDED} diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index 6070dca904e..5aa8f884ca2 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.49 2010/05/07 14:29:36 jmmv Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.50 2010/06/15 19:23:56 joerg Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -320,6 +320,8 @@ ${_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" +pre-install: create-usergroup . endif .endif |