Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/arch/hp300/stand Use 'make print-objdir' to get obj dire...



details:   https://anonhg.NetBSD.org/src/rev/ec4d387b3b30
branches:  trunk
changeset: 500126:ec4d387b3b30
user:      simonb <simonb%NetBSD.org@localhost>
date:      Wed Dec 06 02:35:19 2000 +0000

description:
Use 'make print-objdir' to get obj directory instead of guessing.

diffstat:

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

diffs (32 lines):

diff -r 7043e33b9e9c -r ec4d387b3b30 sys/arch/hp300/stand/Makefile.inc
--- a/sys/arch/hp300/stand/Makefile.inc Wed Dec 06 01:47:49 2000 +0000
+++ b/sys/arch/hp300/stand/Makefile.inc Wed Dec 06 02:35:19 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.10 2000/08/30 23:51:54 jhawk Exp $
+#      $NetBSD: Makefile.inc,v 1.11 2000/12/06 02:35:19 simonb 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}



Home | Main Index | Thread Index | Old Index