4 files changed, 16 insertions, 12 deletions
diff --git a/sys/arch/amd64/stand/boot/Makefile b/sys/arch/amd64/stand/boot/Makefile
index cf61212da36..ff03f477b6a 100644
--- a/sys/arch/amd64/stand/boot/Makefile
+++ b/sys/arch/amd64/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.15 2012/10/12 14:58:26 jsing Exp $
+#	$OpenBSD: Makefile,v 1.16 2012/10/13 14:10:35 jsing Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -50,7 +50,7 @@ CLEANFILES+= ${PROG}.new
 
 ${PROG}: $(OBJS)
 	$(LD) $(LDFLAGS) -o ${PROG}.new $(OBJS)
-	@perl ${.CURDIR}/check-boot.pl ${PROG}.new
+	@perl ${SADIR}/boot/check-boot.pl ${PROG}.new
 	@mv ${PROG}.new ${PROG}
 	@$(SIZE) ${PROG}
 
diff --git a/sys/arch/amd64/stand/fdboot/Makefile b/sys/arch/amd64/stand/fdboot/Makefile
index ffce0e5c0b9..ae9255eba68 100644
--- a/sys/arch/amd64/stand/fdboot/Makefile
+++ b/sys/arch/amd64/stand/fdboot/Makefile
@@ -1,11 +1,13 @@
-#	$OpenBSD: Makefile,v 1.1 2012/10/12 14:00:02 jsing Exp $
-
-PROG=	fdboot
-COPTS=	-DFDBOOT
+#	$OpenBSD: Makefile,v 1.2 2012/10/13 14:10:35 jsing Exp $
 
 MAN=
 MLINKS=
 
+.if ${MACHINE} == "amd64"
+PROG=	fdboot
+COPTS=	-DFDBOOT
+.endif
+
 .PATH:	${.CURDIR}/../boot
 
 .include "${.CURDIR}/../boot/Makefile"
diff --git a/sys/arch/i386/stand/boot/Makefile b/sys/arch/i386/stand/boot/Makefile
index d4b0471601d..b8c1f3e7432 100644
--- a/sys/arch/i386/stand/boot/Makefile
+++ b/sys/arch/i386/stand/boot/Makefile
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile,v 1.43 2012/10/12 15:03:22 jsing Exp $
+#	$OpenBSD: Makefile,v 1.44 2012/10/13 14:10:35 jsing Exp $
 
 .include "${.CURDIR}/../Makefile.inc"
 
@@ -57,7 +57,7 @@ CLEANFILES+= ${PROG}.new
 
 ${PROG}: $(OBJS)
 	$(LD) $(LDFLAGS) -o ${PROG}.new $(OBJS)
-	@perl ${.CURDIR}/check-boot.pl ${PROG}.new
+	@perl ${SADIR}/boot/check-boot.pl ${PROG}.new
 	@mv ${PROG}.new ${PROG}
 	@$(SIZE) ${PROG}
 
diff --git a/sys/arch/i386/stand/fdboot/Makefile b/sys/arch/i386/stand/fdboot/Makefile
index ffce0e5c0b9..5165a5f1fb4 100644
--- a/sys/arch/i386/stand/fdboot/Makefile
+++ b/sys/arch/i386/stand/fdboot/Makefile
@@ -1,11 +1,13 @@
-#	$OpenBSD: Makefile,v 1.1 2012/10/12 14:00:02 jsing Exp $
-
-PROG=	fdboot
-COPTS=	-DFDBOOT
+#	$OpenBSD: Makefile,v 1.2 2012/10/13 14:10:35 jsing Exp $
 
 MAN=
 MLINKS=
 
+.if ${MACHINE} == "i386"
+PROG=	fdboot
+COPTS=	-DFDBOOT
+.endif
+
 .PATH:	${.CURDIR}/../boot
 
 .include "${.CURDIR}/../boot/Makefile"