[src/trunk]: src/sys/arch/amiga/stand/bootblock Now that this file is not inc...

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

details:   https://anonhg.NetBSD.org/src/rev/858665484b4c
branches:  trunk
changeset: 521224:858665484b4c
user:      aymeric <aymeric%NetBSD.org@localhost>
date:      Sat Jan 26 15:07:58 2002 +0000

description:
Now that this file is not included when it should not, use the print-objdir
target instead of guessing (wrongly with the new toolchain) object directories.

This allows cross-building of bootblocks with the new toolchain.

diffstat:

 sys/arch/amiga/stand/bootblock/Makefile.booters |  35 +++++--------------------
 1 files changed, 7 insertions(+), 28 deletions(-)

diffs (63 lines):

diff -r c02cc45166c2 -r 858665484b4c sys/arch/amiga/stand/bootblock/Makefile.booters
--- a/sys/arch/amiga/stand/bootblock/Makefile.booters   Sat Jan 26 15:04:16 2002 +0000
+++ b/sys/arch/amiga/stand/bootblock/Makefile.booters   Sat Jan 26 15:07:58 2002 +0000
@@ -1,52 +1,31 @@
-#      $NetBSD: Makefile.booters,v 1.1 2002/01/26 15:01:17 aymeric Exp $
+#      $NetBSD: Makefile.booters,v 1.2 2002/01/26 15:07:58 aymeric Exp $
 
 BINDIR=                /usr/mdec
 
 .include <bsd.own.mk>
 
 .if ${OBJECT_FMT} == "ELF"
-### Figure out what to use for elf2bb
+
 ELF2BBDIR=     ${.CURDIR}/../elf2bb
-
-.if exists(${ELF2BBDIR}/obj.${MACHINE})
-ELF2BBOBJDIR=  ${ELF2BBDIR}/obj.${MACHINE}
-.elif exists(${ELF2BBDIR}/obj)
-ELF2BBOBJDIR=  ${ELF2BBDIR}/obj
-.else
-ELF2BBOBJDIR=  ${ELF2BBDIR}
-.endif
+ELF2BBOBJDIR!= cd ${ELF2BBDIR} && ${MAKE} print-objdir
 RELOC2BB=      ${ELF2BBOBJDIR}/elf2bb
 
 ${RELOC2BB}:
        @cd ${ELF2BBDIR} && ${MAKE} depend && ${MAKE}
 
 .else
-### Figure out what to use for aout2bb
+
 AOUT2BBDIR=    ${.CURDIR}/../aout2bb
-
-.if exists(${AOUT2BBDIR}/obj.${MACHINE})
-AOUT2BBOBJDIR= ${AOUT2BBDIR}/obj.${MACHINE}
-.elif exists(${AOUT2BBDIR}/obj)
-AOUT2BBOBJDIR= ${AOUT2BBDIR}/obj
-.else
-AOUT2BBOBJDIR= ${AOUT2BBDIR}
-.endif
+AOUT2BBOBJDIR!=        cd ${AOUT2BBDIR} && ${MAKE} print-objdir
 RELOC2BB=      ${AOUT2BBOBJDIR}/aout2bb
 
 ${RELOC2BB}:
        @cd ${AOUT2BBDIR} && ${MAKE} depend && ${MAKE}
+
 .endif
 
-### Figure out what to use for txlt
 TXLTDIR=       ${.CURDIR}/../txlt
-
-.if exists(${TXLTDIR}/obj.${MACHINE})
-TXLTOBJDIR=    ${TXLTDIR}/obj.${MACHINE}
-.elif exists(${TXLTDIR}/obj)
-TXLTOBJDIR=    ${TXLTDIR}/obj
-.else
-TXLTOBJDIR=    ${TXLTDIR}
-.endif
+TXLTOBJDIR!=   /bin/sh -c "cd ${TXLTDIR} && ${MAKE} print-objdir"
 TXLT=          ${TXLTOBJDIR}/txlt
 
 ${TXLT}: