svn commit: r204022 - user/imp/tbemd/sbin

[Warner Losh]

Author: imp
Date: Wed Feb 17 23:54:54 2010
New Revision: 204022
URL: http://svn.freebsd.org/changeset/base/204022

Log:
  Use SUBDIR := ${SUBDIR:O} in preference to SUBDIR = ${_SUBDIR:O}
  
  Submitted by:	jmallet@

Modified:
  user/imp/tbemd/sbin/Makefile
  user/imp/tbemd/sbin/Makefile.amd64
  user/imp/tbemd/sbin/Makefile.arm
  user/imp/tbemd/sbin/Makefile.i386
  user/imp/tbemd/sbin/Makefile.ia64
  user/imp/tbemd/sbin/Makefile.mips
  user/imp/tbemd/sbin/Makefile.pc98
  user/imp/tbemd/sbin/Makefile.sparc64

Modified: user/imp/tbemd/sbin/Makefile
==============================================================================
--- user/imp/tbemd/sbin/Makefile	Wed Feb 17 23:48:47 2010	(r204021)
+++ user/imp/tbemd/sbin/Makefile	Wed Feb 17 23:54:54 2010	(r204022)
@@ -5,7 +5,7 @@
 
 # XXX MISSING:		icheck ncheck
 
-_SUBDIR=adjkerntz \
+SUBDIR=adjkerntz \
 	atacontrol \
 	badsect \
 	camcontrol \
@@ -72,42 +72,42 @@ _SUBDIR=adjkerntz \
 	umount \
 
 .if ${MK_ATM} != "no"
-_SUBDIR += atm
+SUBDIR += atm
 .endif
 
 .if ${MK_CXX} != "no"
-_SUBDIR += devd
+SUBDIR += devd
 .endif
 
 .if ${MK_IPFILTER} != "no"
-_SUBDIR += ipf
+SUBDIR += ipf
 .endif
 
 .if ${MK_IPFW} != "no"
-_SUBDIR += ipfw
-_SUBDIR += natd
+SUBDIR += ipfw
+SUBDIR += natd
 .endif
 
 .if ${MK_PF} != "no"
-_SUBDIR += pfctl
-_SUBDIR += pflogd
+SUBDIR += pfctl
+SUBDIR += pflogd
 .endif
 
 .if ${MK_INET6} != "no"
-_SUBDIR += ping6
-_SUBDIR += rtsol
+SUBDIR += ping6
+SUBDIR += rtsol
 .endif
 
 .if ${MK_QUOTAS} != "no"
-_SUBDIR += quotacheck
+SUBDIR += quotacheck
 .endif
 
 .if ${MK_ROUTED} != "no"
-_SUBDIR += routed
+SUBDIR += routed
 .endif
 
 .include <bsd.arch.inc.mk>
 
-SUBDIR=${_SUBDIR:O}
+SUBDIR := ${SUBDIR:O}
 
 .include <bsd.subdir.mk>

Modified: user/imp/tbemd/sbin/Makefile.amd64
==============================================================================
--- user/imp/tbemd/sbin/Makefile.amd64	Wed Feb 17 23:48:47 2010	(r204021)
+++ user/imp/tbemd/sbin/Makefile.amd64	Wed Feb 17 23:54:54 2010	(r204022)
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-_SUBDIR += bsdlabel
-_SUBDIR += fdisk
+SUBDIR += bsdlabel
+SUBDIR += fdisk

Modified: user/imp/tbemd/sbin/Makefile.arm
==============================================================================
--- user/imp/tbemd/sbin/Makefile.arm	Wed Feb 17 23:48:47 2010	(r204021)
+++ user/imp/tbemd/sbin/Makefile.arm	Wed Feb 17 23:54:54 2010	(r204022)
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-_SUBDIR += bsdlabel
-_SUBDIR += fdisk
+SUBDIR += bsdlabel
+SUBDIR += fdisk

Modified: user/imp/tbemd/sbin/Makefile.i386
==============================================================================
--- user/imp/tbemd/sbin/Makefile.i386	Wed Feb 17 23:48:47 2010	(r204021)
+++ user/imp/tbemd/sbin/Makefile.i386	Wed Feb 17 23:54:54 2010	(r204022)
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-_SUBDIR += bsdlabel
-_SUBDIR += fdisk
-_SUBDIR += sconfig
+SUBDIR += bsdlabel
+SUBDIR += fdisk
+SUBDIR += sconfig

Modified: user/imp/tbemd/sbin/Makefile.ia64
==============================================================================
--- user/imp/tbemd/sbin/Makefile.ia64	Wed Feb 17 23:48:47 2010	(r204021)
+++ user/imp/tbemd/sbin/Makefile.ia64	Wed Feb 17 23:54:54 2010	(r204022)
@@ -1,3 +1,3 @@
 # $FreeBSD$
 
-_SUBDIR += mca
+SUBDIR += mca

Modified: user/imp/tbemd/sbin/Makefile.mips
==============================================================================
--- user/imp/tbemd/sbin/Makefile.mips	Wed Feb 17 23:48:47 2010	(r204021)
+++ user/imp/tbemd/sbin/Makefile.mips	Wed Feb 17 23:54:54 2010	(r204022)
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-_SUBDIR += bsdlabel
-_SUBDIR += fdisk
+SUBDIR += bsdlabel
+SUBDIR += fdisk

Modified: user/imp/tbemd/sbin/Makefile.pc98
==============================================================================
--- user/imp/tbemd/sbin/Makefile.pc98	Wed Feb 17 23:48:47 2010	(r204021)
+++ user/imp/tbemd/sbin/Makefile.pc98	Wed Feb 17 23:54:54 2010	(r204022)
@@ -1,5 +1,5 @@
 # $FreeBSD$
 
-_SUBDIR += bsdlabel
-_SUBDIR += fdisk_pc98
-_SUBDIR += sconfig
+SUBDIR += bsdlabel
+SUBDIR += fdisk_pc98
+SUBDIR += sconfig

Modified: user/imp/tbemd/sbin/Makefile.sparc64
==============================================================================
--- user/imp/tbemd/sbin/Makefile.sparc64	Wed Feb 17 23:48:47 2010	(r204021)
+++ user/imp/tbemd/sbin/Makefile.sparc64	Wed Feb 17 23:54:54 2010	(r204022)
@@ -1,4 +1,4 @@
 # $FreeBSD$
 
-_SUBDIR += bsdlabel
-_SUBDIR += sunlabel
+SUBDIR += bsdlabel
+SUBDIR += sunlabel