Fix INSTALL_AS_USER after r319020.

Reviewed by:	vangyzen
MFC after:	1 week
Sponsored by:	Dell EMC Isilon
This commit is contained in:
Bryan Drewery 2017-07-10 23:52:07 +00:00
parent 7c2f06da87
commit 27f3f39a1d
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=320883

View File

@ -342,19 +342,6 @@ distribution:
MTREE_CMD?= mtree
.if ${MK_INSTALL_AS_USER} == "yes" && ${_uid} != 0
MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \
-e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \
-e 's,\(gid=\)[^ ]* ,\1${_gid} ,' \
-e 's,\(uid=\)[^ ]*$$,\1${_uid},' \
-e 's,\(gid=\)[^ ]*$$,\1${_gid},'
.else
MTREE_FILTER= cat
.if !defined(NO_FSCHG)
MTREE_FSCHG= -i
.endif
.endif
MTREES= mtree/BSD.root.dist / \
mtree/BSD.var.dist /var \
mtree/BSD.usr.dist /usr \
@ -467,3 +454,16 @@ etc-examples: etc-examples-install
DESTDIR=${DESTDIR}${SHAREDIR}/examples
.include <bsd.prog.mk>
.if ${MK_INSTALL_AS_USER} == "yes" && ${_uid} != 0
MTREE_FILTER= sed -e 's,\([gu]\)name=,\1id=,g' \
-e 's,\(uid=\)[^ ]* ,\1${_uid} ,' \
-e 's,\(gid=\)[^ ]* ,\1${_gid} ,' \
-e 's,\(uid=\)[^ ]*$$,\1${_uid},' \
-e 's,\(gid=\)[^ ]*$$,\1${_gid},'
.else
MTREE_FILTER= cat
.if !defined(NO_FSCHG)
MTREE_FSCHG= -i
.endif
.endif