Page MenuHomeFreeBSD
Files F108123746

D14545.diff
No OneTemporary
Actions

D14545.diff
View Options

Index: head/stand/efi/Makefile
===================================================================
--- head/stand/efi/Makefile
+++ head/stand/efi/Makefile
@@ -8,10 +8,7 @@
# 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
Index: head/stand/i386/Makefile
===================================================================
--- head/stand/i386/Makefile
+++ head/stand/i386/Makefile
@@ -7,9 +7,7 @@
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+= kgzldr
.endif
-.if ${MK_ZFS} != "no"
-SUBDIR+= zfsboot gptzfsboot zfsloader
-.endif
+SUBDIR.${MK_ZFS}+= zfsboot gptzfsboot zfsloader
.include <bsd.subdir.mk>
Index: head/stand/powerpc/Makefile
===================================================================
--- head/stand/powerpc/Makefile
+++ head/stand/powerpc/Makefile
@@ -5,8 +5,6 @@
.include <bsd.init.mk>
SUBDIR= boot1.chrp ofw uboot
-.if ${MK_FDT} == "yes"
-SUBDIR+= kboot
-.endif
+SUBDIR.${MK_FDT}+= kboot
.include <bsd.subdir.mk>
Index: head/stand/sparc64/Makefile
===================================================================
--- head/stand/sparc64/Makefile
+++ head/stand/sparc64/Makefile
@@ -5,8 +5,6 @@
.include <bsd.init.mk>
SUBDIR= boot1 loader
-.if ${MK_ZFS} != "no"
-SUBDIR+=zfsboot zfsloader
-.endif
+SUBDIR.${MK_ZFS}+=zfsboot zfsloader
.include <bsd.subdir.mk>
Index: head/stand/uboot/Makefile
===================================================================
--- head/stand/uboot/Makefile
+++ head/stand/uboot/Makefile
@@ -4,8 +4,6 @@
SUBDIR= lib
-.if ${MK_FDT} != "no"
-SUBDIR+=fdt
-.endif
+SUBDIR.${MK_FDT}+=fdt
.include <bsd.subdir.mk>

File Metadata

Mime Type
text/plain
Expires
Wed, Jan 22, 3:32 PM (10 h, 37 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16031535
Default Alt Text
D14545.diff (1 KB)

Event Timeline