Index: stable/11/stand/efi/Makefile
===================================================================
--- stable/11/stand/efi/Makefile	(revision 332147)
+++ stable/11/stand/efi/Makefile	(revision 332148)
@@ -1,19 +1,16 @@
 # $FreeBSD$
 
 NO_OBJ=t
 
 .include <bsd.init.mk>
 
 # In-tree GCC does not support __attribute__((ms_abi)), but gcc newer
 # than 4.5 supports it.
 .if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
 
-.if ${MK_FDT} != "no"
-SUBDIR+=	fdt
-.endif
-
-SUBDIR+=	libefi loader boot1
+SUBDIR.${MK_FDT}+=	fdt
+SUBDIR.yes+=	libefi loader boot1
 
 .endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
 
 .include <bsd.subdir.mk>
Index: stable/11/stand/i386/Makefile
===================================================================
--- stable/11/stand/i386/Makefile	(revision 332147)
+++ stable/11/stand/i386/Makefile	(revision 332148)
@@ -1,27 +1,23 @@
 # $FreeBSD$
 
 NO_OBJ=t
 
 .include <bsd.init.mk>
 
-SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
+SUBDIR.yes=	mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
 		libi386
 
-.if ${MK_LOADER_FIREWIRE} == "yes"
-SUBDIR+=	libfirewire
-.endif
+SUBDIR.${MK_LOADER_FIREWIRE}+=	libfirewire
 
-SUBDIR+=	loader
+SUBDIR.yes+=	loader
 
 # special boot programs, 'self-extracting boot2+loader'
-SUBDIR+=	pxeldr
+SUBDIR.yes+=	pxeldr
 
 .if ${MACHINE_CPUARCH} == "i386"
-SUBDIR+=	kgzldr
+SUBDIR.yes+=	kgzldr
 .endif
 
-.if ${MK_ZFS} != "no"
-SUBDIR+=	zfsboot gptzfsboot zfsloader
-.endif
+SUBDIR.${MK_ZFS}+=	zfsboot gptzfsboot zfsloader
 
 .include <bsd.subdir.mk>
Index: stable/11/stand/powerpc/Makefile
===================================================================
--- stable/11/stand/powerpc/Makefile	(revision 332147)
+++ stable/11/stand/powerpc/Makefile	(revision 332148)
@@ -1,12 +1,10 @@
 # $FreeBSD$
 
 NO_OBJ=t
 
 .include <bsd.init.mk>
 
-SUBDIR=		boot1.chrp ofw uboot
-.if ${MK_FDT} == "yes"
-SUBDIR+=	kboot
-.endif
+SUBDIR.yes=		boot1.chrp ofw uboot
+SUBDIR.${MK_FDT}+=	kboot
 
 .include <bsd.subdir.mk>
Index: stable/11/stand/sparc64/Makefile
===================================================================
--- stable/11/stand/sparc64/Makefile	(revision 332147)
+++ stable/11/stand/sparc64/Makefile	(revision 332148)
@@ -1,12 +1,10 @@
 # $FreeBSD$
 
 NO_OBJ=t
 
 .include <bsd.init.mk>
 
-SUBDIR=	boot1 loader
-.if ${MK_ZFS} != "no"
-SUBDIR+=zfsboot zfsloader
-.endif
+SUBDIR.yes=	boot1 loader
+SUBDIR.${MK_ZFS}+=zfsboot zfsloader
 
 .include <bsd.subdir.mk>
Index: stable/11/stand/uboot/Makefile
===================================================================
--- stable/11/stand/uboot/Makefile	(revision 332147)
+++ stable/11/stand/uboot/Makefile	(revision 332148)
@@ -1,11 +1,9 @@
 # $FreeBSD$
 
 .include <bsd.init.mk>
 
-SUBDIR=	lib
+SUBDIR.yes=	lib
 
-.if ${MK_FDT} != "no"
-SUBDIR+=fdt
-.endif
+SUBDIR.${MK_FDT}+=fdt
 
 .include <bsd.subdir.mk>
Index: stable/11
===================================================================
--- stable/11	(revision 332147)
+++ stable/11	(revision 332148)

Property changes on: stable/11
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r330249-330250