[src/trunk]: src/sys/arch Work around <bsd.lib.mk> used for kernel libs in ot...

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

details:   https://anonhg.NetBSD.org/src/rev/1e140543a6d6
branches:  trunk
changeset: 517563:1e140543a6d6
user:      tv <tv%NetBSD.org@localhost>
date:      Wed Nov 14 23:01:13 2001 +0000

description:
Work around <bsd.lib.mk> used for kernel libs in other places.  Clean up
include paths.

diffstat:

 sys/arch/arc/stand/libsa/Makefile      |  4 +++-
 sys/arch/arm26/stand/lib/Makefile      |  4 +++-
 sys/arch/atari/stand/libsa/Makefile    |  6 ++++--
 sys/arch/i386/stand/lib/Makefile       |  4 +++-
 sys/arch/mvme68k/stand/libbug/Makefile |  4 +++-
 sys/arch/mvme68k/stand/libsa/Makefile  |  4 +++-
 sys/arch/sun3/stand/libsa/Makefile     |  4 +++-
 sys/arch/sun68k/stand/libsa/Makefile   |  4 +++-
 sys/arch/x68k/stand/libdos/Makefile    |  4 +++-
 sys/arch/x68k/stand/libiocs/Makefile   |  8 +++-----
 sys/arch/x68k/stand/libsa/Makefile     |  4 +++-
 11 files changed, 34 insertions(+), 16 deletions(-)

diffs (206 lines):

diff -r a994b42e59ad -r 1e140543a6d6 sys/arch/arc/stand/libsa/Makefile
--- a/sys/arch/arc/stand/libsa/Makefile Wed Nov 14 22:47:16 2001 +0000
+++ b/sys/arch/arc/stand/libsa/Makefile Wed Nov 14 23:01:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.2 2000/01/23 21:02:00 soda Exp $
+#      $NetBSD: Makefile,v 1.3 2001/11/14 23:01:13 tv Exp $
 #      @(#)Makefile    8.2 (Berkeley) 2/16/94
 
 LIB=   sa
@@ -9,6 +9,8 @@
 .PATH: ../../../../lib/libsa ../../../../lib/libkern
 NOPROFILE=noprofile
 
+.include <bsd.own.mk>
+.undef DESTDIR
 .include <bsd.lib.mk>
 
 CFLAGS=-O2 -I../../include -I/sys -DSMALL
diff -r a994b42e59ad -r 1e140543a6d6 sys/arch/arm26/stand/lib/Makefile
--- a/sys/arch/arm26/stand/lib/Makefile Wed Nov 14 22:47:16 2001 +0000
+++ b/sys/arch/arm26/stand/lib/Makefile Wed Nov 14 23:01:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.1 2001/07/26 22:11:08 bjh21 Exp $
+#      $NetBSD: Makefile,v 1.2 2001/11/14 23:01:14 tv Exp $
 
 S?=    ${.CURDIR}/../../../../
 
@@ -14,6 +14,8 @@
 SRCS=  srt1.c devopen.c
 SRCS+= riscoscalls.S riscoscons.c riscoserrors.c riscosfile.c
 
+.include <bsd.own.mk>
+.undef DESTDIR
 .include <bsd.lib.mk>
 
 lib${LIB}.o:: ${OBJS}
diff -r a994b42e59ad -r 1e140543a6d6 sys/arch/atari/stand/libsa/Makefile
--- a/sys/arch/atari/stand/libsa/Makefile       Wed Nov 14 22:47:16 2001 +0000
+++ b/sys/arch/atari/stand/libsa/Makefile       Wed Nov 14 23:01:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2001/10/13 20:10:02 leo Exp $
+#      $NetBSD: Makefile,v 1.12 2001/11/14 23:01:14 tv Exp $
 
 LIB=   sa
 
@@ -11,7 +11,7 @@
 NO_NET=
 
 DEFS=  -D_STANDALONE -DHEAP_VARIABLE
-INCL=  -I/usr/include -I- -I${S_MACHSA} -I${S_KERN} -I${S_SA} -I${S} 
+INCL=  -I${S_MACHSA} -I${S_KERN} -I${S_SA} -I${S} 
 
 #
 # NetBSD/Atari specific replacements: stand.h dev.c
@@ -53,4 +53,6 @@
 # only needed during build
 libinstall::
 
+.include <bsd.own.mk>
+.undef DESTDIR
 .include <bsd.lib.mk>
diff -r a994b42e59ad -r 1e140543a6d6 sys/arch/i386/stand/lib/Makefile
--- a/sys/arch/i386/stand/lib/Makefile  Wed Nov 14 22:47:16 2001 +0000
+++ b/sys/arch/i386/stand/lib/Makefile  Wed Nov 14 23:01:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.18 2001/05/19 17:53:30 jdolecek Exp $
+#      $NetBSD: Makefile,v 1.19 2001/11/14 23:01:14 tv Exp $
 
 S?=    ${.CURDIR}/../../../../
 
@@ -38,6 +38,8 @@
 SRCS+= biosmca.S
 .endif
 
+.include <bsd.own.mk>
+.undef DESTDIR
 .include <bsd.lib.mk>
 
 lib${LIB}.o:: ${OBJS}
diff -r a994b42e59ad -r 1e140543a6d6 sys/arch/mvme68k/stand/libbug/Makefile
--- a/sys/arch/mvme68k/stand/libbug/Makefile    Wed Nov 14 22:47:16 2001 +0000
+++ b/sys/arch/mvme68k/stand/libbug/Makefile    Wed Nov 14 23:01:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.12 2000/12/05 21:54:33 scw Exp $
+#      $NetBSD: Makefile,v 1.13 2001/11/14 23:01:14 tv Exp $
 
 LIB=bug
 
@@ -26,4 +26,6 @@
 
 all realall: lib${LIB}.a bugstart.o
 
+.include <bsd.own.mk>
+.undef DESTDIR
 .include <bsd.lib.mk>
diff -r a994b42e59ad -r 1e140543a6d6 sys/arch/mvme68k/stand/libsa/Makefile
--- a/sys/arch/mvme68k/stand/libsa/Makefile     Wed Nov 14 22:47:16 2001 +0000
+++ b/sys/arch/mvme68k/stand/libsa/Makefile     Wed Nov 14 23:01:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.19 2001/10/31 01:51:44 thorpej Exp $
+#      $NetBSD: Makefile,v 1.20 2001/11/14 23:01:15 tv Exp $
 
 LIB=sa
 
@@ -47,4 +47,6 @@
 
 all realall: lib${LIB}.a SRT0.o
 
+.include <bsd.own.mk>
+.undef DESTDIR
 .include <bsd.lib.mk>
diff -r a994b42e59ad -r 1e140543a6d6 sys/arch/sun3/stand/libsa/Makefile
--- a/sys/arch/sun3/stand/libsa/Makefile        Wed Nov 14 22:47:16 2001 +0000
+++ b/sys/arch/sun3/stand/libsa/Makefile        Wed Nov 14 23:01:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.34 2001/10/31 01:51:46 thorpej Exp $
+#      $NetBSD: Makefile,v 1.35 2001/11/14 23:01:15 tv Exp $
 
 LIB=sa
 
@@ -49,6 +49,8 @@
 # only needed during build
 libinstall::
 
+.include <bsd.own.mk>
+.undef DESTDIR
 .include <bsd.lib.mk>
 
 # Nuke these...
diff -r a994b42e59ad -r 1e140543a6d6 sys/arch/sun68k/stand/libsa/Makefile
--- a/sys/arch/sun68k/stand/libsa/Makefile      Wed Nov 14 22:47:16 2001 +0000
+++ b/sys/arch/sun68k/stand/libsa/Makefile      Wed Nov 14 23:01:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2001/10/31 01:51:46 thorpej Exp $
+#      $NetBSD: Makefile,v 1.5 2001/11/14 23:01:16 tv Exp $
 
 LIB=sa
 
@@ -58,6 +58,8 @@
 OBJS+= ${LIBGCC_OBJS}
 .endif
 
+.include <bsd.own.mk>
+.undef DESTDIR=
 .include <bsd.lib.mk>
 
 # Nuke these...
diff -r a994b42e59ad -r 1e140543a6d6 sys/arch/x68k/stand/libdos/Makefile
--- a/sys/arch/x68k/stand/libdos/Makefile       Wed Nov 14 22:47:16 2001 +0000
+++ b/sys/arch/x68k/stand/libdos/Makefile       Wed Nov 14 23:01:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 1999/11/11 08:14:43 itohy Exp $
+#      $NetBSD: Makefile,v 1.5 2001/11/14 23:01:15 tv Exp $
 
 LIB=   dos
 
@@ -63,4 +63,6 @@
 # only needed during build
 libinstall::
 
+.include <bsd.own.mk>
+.undef DESTDIR
 .include <bsd.lib.mk>
diff -r a994b42e59ad -r 1e140543a6d6 sys/arch/x68k/stand/libiocs/Makefile
--- a/sys/arch/x68k/stand/libiocs/Makefile      Wed Nov 14 22:47:16 2001 +0000
+++ b/sys/arch/x68k/stand/libiocs/Makefile      Wed Nov 14 23:01:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2000/10/19 16:17:41 minoura Exp $
+#      $NetBSD: Makefile,v 1.6 2001/11/14 23:01:15 tv Exp $
 
 LIB=   iocs
 
@@ -6,10 +6,6 @@
 MKPROFILE=no
 MKPIC=no
 
-.if defined(DESTDIR)
-CPPFLAGS+= -nostdinc -idirafter ${DESTDIR}/usr/include
-.endif
-
 AWK?=  awk
 
 ASM=   b_keyinp.o b_keysns.o b_sftsns.o bitsns.o skeyset.o tvctrl.o \
@@ -63,4 +59,6 @@
 # only needed during build
 libinstall::
 
+.include <bsd.own.mk>
+.undef DESTDIR
 .include <bsd.lib.mk>
diff -r a994b42e59ad -r 1e140543a6d6 sys/arch/x68k/stand/libsa/Makefile
--- a/sys/arch/x68k/stand/libsa/Makefile        Wed Nov 14 22:47:16 2001 +0000
+++ b/sys/arch/x68k/stand/libsa/Makefile        Wed Nov 14 23:01:13 2001 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2001/10/31 01:51:47 thorpej Exp $
+#      $NetBSD: Makefile,v 1.8 2001/11/14 23:01:15 tv Exp $
 
 S=             ${.CURDIR}/../../../..
 LIBSADIR=      $S/lib/libsa
@@ -47,4 +47,6 @@
 CLEANFILES+= machine m68k
 .endif
 
+.include <bsd.own.mk>
+.undef DESTDIR
 .include <bsd.lib.mk>