From 09bb7a3e1eea5ba25e9fc9b4b9038ed33aee94e9 Mon Sep 17 00:00:00 2001
From: kevans <kevans@FreeBSD.org>
Date: Thu, 1 Mar 2018 19:59:49 +0000
Subject: [PATCH] stand: Makefile SUBDIR cleanup

Use SUBDIR.${MK_*} where appropriate. r330248 eliminated most of the
offenders, sweep the rest under the rug.

Differential Revision:	https://reviews.freebsd.org/D14545
---
 stand/efi/Makefile     | 5 +----
 stand/i386/Makefile    | 8 ++------
 stand/powerpc/Makefile | 4 +---
 stand/sparc64/Makefile | 4 +---
 stand/uboot/Makefile   | 4 +---
 5 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/stand/efi/Makefile b/stand/efi/Makefile
index bf37fccff66..91dcb2b6b40 100644
--- a/stand/efi/Makefile
+++ b/stand/efi/Makefile
@@ -8,10 +8,7 @@ NO_OBJ=t
 # than 4.5 supports it.
 .if ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
 
-.if ${MK_FDT} != "no"
-SUBDIR+=	fdt
-.endif
-
+SUBDIR.${MK_FDT}+=	fdt
 SUBDIR+=	libefi loader boot1
 
 .endif # ${COMPILER_TYPE} != "gcc" || ${COMPILER_VERSION} >= 40500
diff --git a/stand/i386/Makefile b/stand/i386/Makefile
index a67088b6821..c762c0d33c8 100644
--- a/stand/i386/Makefile
+++ b/stand/i386/Makefile
@@ -7,9 +7,7 @@ NO_OBJ=t
 SUBDIR=		mbr pmbr boot0 boot0sio btx boot2 cdboot gptboot \
 		libi386
 
-.if ${MK_LOADER_FIREWIRE} == "yes"
-SUBDIR+=	libfirewire
-.endif
+SUBDIR.${MK_LOADER_FIREWIRE}+=	libfirewire
 
 SUBDIR+=	loader
 
@@ -20,8 +18,6 @@ SUBDIR+=	pxeldr
 SUBDIR+=	kgzldr
 .endif
 
-.if ${MK_ZFS} != "no"
-SUBDIR+=	zfsboot gptzfsboot zfsloader
-.endif
+SUBDIR.${MK_ZFS}+=	zfsboot gptzfsboot zfsloader
 
 .include <bsd.subdir.mk>
diff --git a/stand/powerpc/Makefile b/stand/powerpc/Makefile
index 09b2bfe8715..f1cd7d8b2e5 100644
--- a/stand/powerpc/Makefile
+++ b/stand/powerpc/Makefile
@@ -5,8 +5,6 @@ NO_OBJ=t
 .include <bsd.init.mk>
 
 SUBDIR=		boot1.chrp ofw uboot
-.if ${MK_FDT} == "yes"
-SUBDIR+=	kboot
-.endif
+SUBDIR.${MK_FDT}+=	kboot
 
 .include <bsd.subdir.mk>
diff --git a/stand/sparc64/Makefile b/stand/sparc64/Makefile
index 3c6e2bf85c9..12acf55458d 100644
--- a/stand/sparc64/Makefile
+++ b/stand/sparc64/Makefile
@@ -5,8 +5,6 @@ NO_OBJ=t
 .include <bsd.init.mk>
 
 SUBDIR=	boot1 loader
-.if ${MK_ZFS} != "no"
-SUBDIR+=zfsboot zfsloader
-.endif
+SUBDIR.${MK_ZFS}+=zfsboot zfsloader
 
 .include <bsd.subdir.mk>
diff --git a/stand/uboot/Makefile b/stand/uboot/Makefile
index 8c3a80dd6e2..5ba6e2accf8 100644
--- a/stand/uboot/Makefile
+++ b/stand/uboot/Makefile
@@ -4,8 +4,6 @@
 
 SUBDIR=	lib
 
-.if ${MK_FDT} != "no"
-SUBDIR+=fdt
-.endif
+SUBDIR.${MK_FDT}+=fdt
 
 .include <bsd.subdir.mk>
-- 
2.45.0