aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan Drewery <bdrewery@FreeBSD.org>2017-07-10 23:52:07 +0000
committerBryan Drewery <bdrewery@FreeBSD.org>2017-07-10 23:52:07 +0000
commit27f3f39a1d48691496d335975f617a3c1311b60e (patch)
tree52d443b470c64760fef5298ceba31debead00720
parent7c2f06da87f1953a95bea7b9d6b368eb1fc7c734 (diff)
downloadsrc-27f3f39a1d48691496d335975f617a3c1311b60e.tar.gz
src-27f3f39a1d48691496d335975f617a3c1311b60e.zip
Fix INSTALL_AS_USER after r319020.
Reviewed by: vangyzen MFC after: 1 week Sponsored by: Dell EMC Isilon
Notes
Notes: svn path=/head/; revision=320883
-rw-r--r--etc/Makefile26
1 files changed, 13 insertions, 13 deletions
diff --git a/etc/Makefile b/etc/Makefile
index 7eadb1bba99b..9713c795eae4 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -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