Index: stable/10/sys/boot/Makefile
===================================================================
--- stable/10/sys/boot/Makefile	(revision 293352)
+++ stable/10/sys/boot/Makefile	(revision 293353)
@@ -1,21 +1,19 @@
 # $FreeBSD$
 
 .include <bsd.own.mk>
-.include <bsd.arch.inc.mk>
 
 .if ${MK_FORTH} != "no"
 # Build the add-in FORTH interpreter.
 SUBDIR+=		ficl
 SUBDIR+=		forth
 .endif
 
+.include <bsd.arch.inc.mk>
+
 # Pick the machine-dependent subdir based on the target architecture.
 ADIR=			${MACHINE:S/powerpc64/powerpc/}
 .if exists(${.CURDIR}/${ADIR}/.)
 SUBDIR+=		${ADIR}
-.endif
-.if ${MACHINE} == "amd64"
-SUBDIR+=		i386
 .endif
 
 .include <bsd.subdir.mk>
Index: stable/10/sys/boot/Makefile.amd64
===================================================================
--- stable/10/sys/boot/Makefile.amd64	(revision 293352)
+++ stable/10/sys/boot/Makefile.amd64	(revision 293353)
@@ -1,10 +1,12 @@
 # $FreeBSD$
 
 SUBDIR+=		efi
 SUBDIR+=		libstand32
 SUBDIR+=		zfs
 SUBDIR+=		userboot
 
 .if ${MK_FORTH} != "no"
 SUBDIR+=		ficl32
 .endif
+
+SUBDIR+=		i386
Index: stable/10
===================================================================
--- stable/10	(revision 293352)
+++ stable/10	(revision 293353)

Property changes on: stable/10
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r280808