diff options
| author | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-25 19:44:58 +0000 |
|---|---|---|
| committer | Bryan Drewery <bdrewery@FreeBSD.org> | 2015-11-25 19:44:58 +0000 |
| commit | cf10dd450d14de2de2a0467182390c4a370dfcea (patch) | |
| tree | d9f15250d2ad8ba8be2a15f9ab596b98ce2b83ee | |
| parent | 5a0d38b3aa1baa400284e2e9a39524ac4a656143 (diff) | |
| download | src-cf10dd450d14de2de2a0467182390c4a370dfcea.tar.gz src-cf10dd450d14de2de2a0467182390c4a370dfcea.zip | |
Stop looking up the same id(1) results in sub-makes.
Sponsored by: EMC / Isilon Storage Division
Notes
Notes:
svn path=/head/; revision=291323
| -rw-r--r-- | share/mk/bsd.own.mk | 13 |
1 files changed, 12 insertions, 1 deletions
diff --git a/share/mk/bsd.own.mk b/share/mk/bsd.own.mk index cf3bee6b2f00..9f33424cae20 100644 --- a/share/mk/bsd.own.mk +++ b/share/mk/bsd.own.mk @@ -133,12 +133,23 @@ CTFCONVERT_CMD= @: .endif .if ${MK_INSTALL_AS_USER} != "no" +.if !defined(_uid) _uid!= id -u +.export _uid +.endif .if ${_uid} != 0 .if !defined(USER) -USER!= id -un +# Avoid exporting USER +.if !defined(_USER) +_USER!= id -un +.export _USER +.endif +USER= ${_USER} .endif +.if !defined(_gid) _gid!= id -g +.export _gid +.endif .for x in BIN CONF DOC DTB INFO KMOD LIB MAN NLS SHARE $xOWN= ${USER} $xGRP= ${_gid} |