Index: sys/boot/arm/uboot/Makefile =================================================================== --- sys/boot/arm/uboot/Makefile +++ sys/boot/arm/uboot/Makefile @@ -146,6 +146,7 @@ CLEANFILES+= ldscript.abs ldscript.pie ubldr ubldr.pie ubldr.bin .if !defined(LOADER_ONLY) +.if ${MK_FORTH} != "no" .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" @@ -156,4 +157,6 @@ FILESNAME_menu.rc= menu.rc.sample .endif +.endif + .include Index: sys/boot/mips/beri/loader/Makefile =================================================================== --- sys/boot/mips/beri/loader/Makefile +++ sys/boot/mips/beri/loader/Makefile @@ -122,10 +122,13 @@ cat ${.ALLSRC} | \ awk -f ${.CURDIR}/../../../common/merge_help.awk > ${.TARGET} +.if ${MK_FORTH} != "no" .PATH: ${.CURDIR}/../../../forth .include "${.CURDIR}/../../../forth/Makefile.inc" FILES+= loader.rc menu.rc +.endif + .if defined(LOADER_USB_SUPPORT) # Do garbage collection Index: sys/boot/pc98/loader/Makefile =================================================================== --- sys/boot/pc98/loader/Makefile +++ sys/boot/pc98/loader/Makefile @@ -87,10 +87,12 @@ # XXX INSTALLFLAGS_loader= -b FILESMODE_${LOADER}= ${BINMODE} -b +.if ${MK_FORTH} != "no" .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" FILES+= ${.CURDIR}/../../i386/loader/loader.rc menu.rc +.endif # XXX crt0.o needs to be first for pxeboot(8) to work OBJS= ${BTXCRT} Index: sys/boot/powerpc/kboot/Makefile =================================================================== --- sys/boot/powerpc/kboot/Makefile +++ sys/boot/powerpc/kboot/Makefile @@ -109,9 +109,11 @@ cat ${.ALLSRC} | \ awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} +.if ${MK_FORTH} != "no" .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" FILES+= loader.rc menu.rc +.endif .include Index: sys/boot/powerpc/ofw/Makefile =================================================================== --- sys/boot/powerpc/ofw/Makefile +++ sys/boot/powerpc/ofw/Makefile @@ -109,9 +109,11 @@ cat ${.ALLSRC} | \ awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} +.if ${MK_FORTH} != "no" .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" FILES+= loader.rc menu.rc +.endif .include Index: sys/boot/sparc64/loader/Makefile =================================================================== --- sys/boot/sparc64/loader/Makefile +++ sys/boot/sparc64/loader/Makefile @@ -96,9 +96,11 @@ cat ${.ALLSRC} | \ awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} +.if ${MK_FORTH} != "no" .PATH: ${.CURDIR}/../../forth .include "${.CURDIR}/../../forth/Makefile.inc" FILES+= loader.rc menu.rc +.endif .include Index: sys/boot/userboot/Makefile =================================================================== --- sys/boot/userboot/Makefile +++ sys/boot/userboot/Makefile @@ -1,8 +1,15 @@ # $FreeBSD$ .include +.include -SUBDIR= ficl libstand test zfs userboot +SUBDIR= libstand + +.if ${MK_FORTH} != "no" +SUBDIR+= ficl +.endif + +SUBDIR+= test zfs userboot .include