svn commit: r323302 - in stable/11: bin sbin usr.bin usr.sbin

[Ngie Cooper]

Author: ngie
Date: Fri Sep  8 04:46:55 2017
New Revision: 323302
URL: https://svnweb.freebsd.org/changeset/base/323302

Log:
  MFC r320701:
  
  Remove SUBDIR ordering/uniquifying in *bin/Makefile
  
  After the addition of SUBDIR.yes, uniquifying/ordering the SUBDIRs doesn't
  make a whole lot of sense, and it's in effect a half measure.
  
  Ordering SUBDIR (after adding SUBDIR.yes to it) in bsd.subdir.mk is a
  separate change that warrants more discussion/testing, because while
  the SUBDIR_PARALLEL work largely fixed dependency ordering for SUBDIRs,
  there might be downstream FreeBSD consumers that rely on the SUBDIR
  ordering.

Modified:
  stable/11/bin/Makefile
  stable/11/sbin/Makefile
  stable/11/usr.bin/Makefile
  stable/11/usr.sbin/Makefile
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/bin/Makefile
==============================================================================
--- stable/11/bin/Makefile	Fri Sep  8 04:45:18 2017	(r323301)
+++ stable/11/bin/Makefile	Fri Sep  8 04:46:55 2017	(r323302)
@@ -47,8 +47,6 @@ SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.arch.inc.mk>
 
-SUBDIR:=	${SUBDIR:O}
-
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>

Modified: stable/11/sbin/Makefile
==============================================================================
--- stable/11/sbin/Makefile	Fri Sep  8 04:45:18 2017	(r323301)
+++ stable/11/sbin/Makefile	Fri Sep  8 04:46:55 2017	(r323302)
@@ -93,8 +93,6 @@ SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.arch.inc.mk>
 
-SUBDIR:=	${SUBDIR:O}
-
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>

Modified: stable/11/usr.bin/Makefile
==============================================================================
--- stable/11/usr.bin/Makefile	Fri Sep  8 04:45:18 2017	(r323301)
+++ stable/11/usr.bin/Makefile	Fri Sep  8 04:46:55 2017	(r323302)
@@ -311,8 +311,6 @@ SUBDIR+=	mkesdb_static
 
 .include <bsd.arch.inc.mk>
 
-SUBDIR:=	${SUBDIR:O:u}
-
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>

Modified: stable/11/usr.sbin/Makefile
==============================================================================
--- stable/11/usr.sbin/Makefile	Fri Sep  8 04:45:18 2017	(r323301)
+++ stable/11/usr.sbin/Makefile	Fri Sep  8 04:46:55 2017	(r323302)
@@ -217,8 +217,6 @@ SUBDIR.${MK_TESTS}+=	tests
 
 .include <bsd.arch.inc.mk>
 
-SUBDIR:=	${SUBDIR:O}
-
 SUBDIR_PARALLEL=
 
 .include <bsd.subdir.mk>