[src/netbsd-1-4]: src/sys/arch/atari/stand/bootxx pullup 1.6->1.7 (leo)

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

details:   https://anonhg.NetBSD.org/src/rev/434d3108cbce
branches:  netbsd-1-4
changeset: 468417:434d3108cbce
user:      perry <perry%NetBSD.org@localhost>
date:      Thu Apr 22 14:51:12 1999 +0000

description:
pullup 1.6->1.7 (leo)

diffstat:

 sys/arch/atari/stand/bootxx/Makefile |  19 +++++++++++++++----
 1 files changed, 15 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r 26a06df07bbf -r 434d3108cbce sys/arch/atari/stand/bootxx/Makefile
--- a/sys/arch/atari/stand/bootxx/Makefile      Thu Apr 22 14:47:59 1999 +0000
+++ b/sys/arch/atari/stand/bootxx/Makefile      Thu Apr 22 14:51:12 1999 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 1999/02/19 21:51:20 leo Exp $
+#      $NetBSD: Makefile,v 1.6.2.1 1999/04/22 14:51:12 perry Exp $
 
 PROG=  bootxx
 SRCS=  bootxx.c bsdstart.s filesystem.c
@@ -10,9 +10,6 @@
 
 LIBCRT0=
 
-DPADD= ${S_MACHSA}/libsa.a
-LDADD= ${S_MACHSA}/libsa.a
-
 DEFS=  -D_STANDALONE
 INCL=  -I. -I${S_LIBTOS} -I${S_MACHSA} -I${S_KERN} -I${S_SA} -I${S}
 
@@ -27,6 +24,20 @@
 S_MACHSA=${S}/arch/atari/stand/libsa
 S_LIBTOS=${S}/arch/atari/stand/tostools/libtos
 
+.if exists(${S_MACHSA}/libsa.a)
+LIBSA=${S_MACHSA}/libsa.a
+.else
+.      if exists(${S_MACHSA}/obj/libsa.a)
+LIBSA=${S_MACHSA}/obj/libsa.a
+.      else
+LIBSA=${S_MACHSA}/obj.${MACHINE}/libsa.a
+.      endif
+.endif
+
+DPADD= ${LIBSA}
+LDADD= ${LIBSA}
+
+
 beforeinstall:
        @len=`size ${PROG} | awk 'NR==2 { print $$1+$$2 }'`;    \
         if [ $$len -gt 6656 ]; then                            \