[src/netbsd-1-5]: src/sys/arch/hp300/stand Pull up revision 1.11 (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/28f318a21b55
branches:  netbsd-1-5
changeset: 490309:28f318a21b55
user:      he <he%NetBSD.org@localhost>
date:      Wed Dec 13 22:51:51 2000 +0000

description:
Pull up revision 1.11 (requested by simonb):
  Use 'make print-objdir' to get obj directory correctly.

diffstat:

 sys/arch/hp300/stand/Makefile.inc |  16 ++++------------
 1 files changed, 4 insertions(+), 12 deletions(-)

diffs (32 lines):

diff -r 4ae00d37adfc -r 28f318a21b55 sys/arch/hp300/stand/Makefile.inc
--- a/sys/arch/hp300/stand/Makefile.inc Wed Dec 13 22:49:16 2000 +0000
+++ b/sys/arch/hp300/stand/Makefile.inc Wed Dec 13 22:51:51 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.9 2000/05/31 14:31:23 he Exp $
+#      $NetBSD: Makefile.inc,v 1.9.2.1 2000/12/13 22:51:51 he Exp $
 
 BINDIR=                        /usr/mdec
 
@@ -21,19 +21,11 @@
                        ite_subr.c ite_tc.c ite_hy.c kbd.c kbdconf.c \
                        nhpib.c rd.c scsi.c sd.c
 
-### Figure out what to use for mkboot
-MKBOOTDIR=             ${.CURDIR}/../mkboot
-
-.if exists(${MKBOOTDIR}/obj.${MACHINE})
-MKBOOTOBJDIR=          ${MKBOOTDIR}/obj.${MACHINE}
-.elif exists (${MKBOOTDIR}/obj)
-MKBOOTOBJDIR=          ${MKBOOTDIR}/obj
-.else
-MKBOOTOBJDIR=          ${MKBOOTDIR}
+.ifnmake(print-objdir)
+MKBOOTOBJDIR!=         cd ${.CURDIR}/../mkboot ; ${MAKE} print-objdir
+MKBOOT_PROG=           ${MKBOOTOBJDIR}/mkboot
 .endif
 
-MKBOOT_PROG=           ${MKBOOTOBJDIR}/mkboot
-
 # Make sure ${MKBOOT_PROG} is always available
 ${MKBOOT_PROG}:
        @cd ${MKBOOTDIR} && make depend && make