svn commit: r243392 - head/share/mk

[Simon J. Gerraty]

Author: sjg
Date: Thu Nov 22 04:50:42 2012
New Revision: 243392
URL: http://svnweb.freebsd.org/changeset/base/243392

Log:
  INSTALL_AS_USER: output of id -un will never match 0 so use id -u
  and USER for BINOWN etc.
  
  Approved by:	marcel (mentor)

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

Modified: head/share/mk/bsd.own.mk
==============================================================================
--- head/share/mk/bsd.own.mk	Thu Nov 22 04:17:32 2012	(r243391)
+++ head/share/mk/bsd.own.mk	Thu Nov 22 04:50:42 2012	(r243392)
@@ -678,11 +678,14 @@ CTFCONVERT_CMD=	@:
 .endif 
 
 .if ${MK_INSTALL_AS_USER} != "no"
-_uid!=	id -un
+_uid!=	id -u
 .if ${_uid} != 0
+.if !defined(USER)
+USER!=	id -un
+.endif
 _gid!=	id -gn
 .for x in BIN CONF DOC INFO KMOD LIB MAN NLS SHARE
-$xOWN=	${_uid}
+$xOWN=	${USER}
 $xGRP=	${_gid}
 .endfor
 .endif