From e3166ce34cb47a7adb47bcff1c02a3f96b8b4a67 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Tue, 12 Jul 2011 03:09:03 +0000
Subject: [PATCH] fix previous and only force the failure if reloc2bb already
 failed.

---
 sys/arch/amiga/stand/bootblock/boot/Makefile       | 4 ++--
 sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sys/arch/amiga/stand/bootblock/boot/Makefile b/sys/arch/amiga/stand/bootblock/boot/Makefile
index 52c1a2c2dfc5..0065dd73360a 100644
--- a/sys/arch/amiga/stand/bootblock/boot/Makefile
+++ b/sys/arch/amiga/stand/bootblock/boot/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.45 2011/07/11 01:24:34 mrg Exp $
+#	$NetBSD: Makefile,v 1.46 2011/07/12 03:09:03 mrg Exp $
 
 .include <bsd.own.mk>
 .include <bsd.sys.mk>		# for HOST_SH
@@ -98,7 +98,7 @@ CFLAGS+= -Wall -Wmissing-prototypes -Wstrict-prototypes -Wpointer-arith
 .S.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
 
 boot.amiga: x.out
-	${RELOC2BB} -S x.out $@ || ${NM} -u x.out && false
+	${RELOC2BB} -S x.out $@ || (${NM} -u x.out && false)
 
 x.out: xxstart.o libboot.a ${LIBZ}
 	${LD} ${LDFLAGS} -r -dc -e start -o $@ $>
diff --git a/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile b/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
index 387ba3e94380..c2b9984b8753 100644
--- a/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
+++ b/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.16 2011/07/11 01:24:34 mrg Exp $
+#	$NetBSD: Makefile,v 1.17 2011/07/12 03:09:03 mrg Exp $
 
 ### what we need:
 
@@ -73,10 +73,10 @@ DEFS+=	-D__daddr_t=int32_t
 .S.o: ; ${CC} ${CAFLAGS} ${COPTS} -x assembler-with-cpp -o $@ -c $<
 
 bootxx_ffs: x.out
-	${RELOC2BB} x.out $@ || ${NM} -u x.out && false
+	${RELOC2BB} x.out $@ || (${NM} -u x.out && false)
 
 bootxx_fd: f.out
-	${RELOC2BB} -F f.out $@ || ${NM} -u f.out && false
+	${RELOC2BB} -F f.out $@ || (${NM} -u f.out && false)
 
 x.out: xxstart.o libboot.a
 	${LD} ${LDFLAGS} -r -dc -e _start -o $@ $>