Author: bdrewery
Date: Fri Jul 21 17:56:22 2017
New Revision: 321338
URL: https://svnweb.freebsd.org/changeset/base/321338
Log:
MFC r320883:
Fix INSTALL_AS_USER after r319020.
Modified:
stable/11/etc/Makefile
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/etc/Makefile
==============================================================================
--- stable/11/etc/Makefile Fri Jul 21 17:55:40 2017 (r321337)
+++ stable/11/etc/Makefile Fri Jul 21 17:56:22 2017 (r321338)
@@ -340,19 +340,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 \
@@ -468,3 +455,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
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
