svn commit: r291323 - head/share/mk

[Bryan Drewery]

Author: bdrewery
Date: Wed Nov 25 19:44:58 2015
New Revision: 291323
URL: https://svnweb.freebsd.org/changeset/base/291323

Log:
  Stop looking up the same id(1) results in sub-makes.
  
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.own.mk

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Wed Nov 25 19:44:55 2015	(r291322)
+++ head/share/mk/bsd.own.mk	Wed Nov 25 19:44:58 2015	(r291323)
@@ -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}