[src/trunk]: src/sys/arch/amiga/stand/bootblock fix previous and only force t...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/459ce44d7a91
branches:  trunk
changeset: 767225:459ce44d7a91
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jul 12 03:09:03 2011 +0000

description:
fix previous and only force the failure if reloc2bb already failed.

diffstat:

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

diffs (40 lines):

diff -r fc725bda16fb -r 459ce44d7a91 sys/arch/amiga/stand/bootblock/boot/Makefile
--- a/sys/arch/amiga/stand/bootblock/boot/Makefile      Tue Jul 12 02:46:03 2011 +0000
+++ b/sys/arch/amiga/stand/bootblock/boot/Makefile      Tue Jul 12 03:09:03 2011 +0000
@@ -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 @@
 .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 -r fc725bda16fb -r 459ce44d7a91 sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile
--- a/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Tue Jul 12 02:46:03 2011 +0000
+++ b/sys/arch/amiga/stand/bootblock/bootxx_ffs/Makefile        Tue Jul 12 03:09:03 2011 +0000
@@ -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 @@
 .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 $@ $>