[src/trunk]: src Adjust everything under src (but outside src/tools) to use

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

details:   https://anonhg.NetBSD.org/src/rev/1e76f9ece59a
branches:  trunk
changeset: 783046:1e76f9ece59a
user:      apb <apb%NetBSD.org@localhost>
date:      Sun Dec 02 12:55:27 2012 +0000

description:
Adjust everything under src (but outside src/tools) to use
the TOOLDIR version of libnbcompat, associated include files,
and associated defs.mk file, instead of the version from the
.OBJDIR of src/tools/compat.  This should fix PR 47188.

diffstat:

 bin/sh/Makefile                           |  5 ++---
 distrib/cdrom/macppc_installboot/Makefile |  6 ++----
 distrib/cdrom/macppc_mkboothfs/Makefile   |  6 ++----
 external/gpl3/gcc/usr.bin/Makefile.inc    |  5 ++---
 gnu/usr.bin/gcc4/Makefile.inc             |  5 ++---
 5 files changed, 10 insertions(+), 17 deletions(-)

diffs (97 lines):

diff -r 070342e8e82c -r 1e76f9ece59a bin/sh/Makefile
--- a/bin/sh/Makefile   Sun Dec 02 12:48:32 2012 +0000
+++ b/bin/sh/Makefile   Sun Dec 02 12:55:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.98 2011/08/23 10:47:06 christos Exp $
+#      $NetBSD: Makefile,v 1.99 2012/12/02 12:55:27 apb Exp $
 #      @(#)Makefile    8.4 (Berkeley) 5/5/95
 
 .include <bsd.own.mk>
@@ -74,8 +74,7 @@
        [ -f nodes.h ]
 
 .if ${USETOOLS} == "yes"
-COMPATOBJDIR!= cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
-NBCOMPATLIB=   -L${COMPATOBJDIR} -lnbcompat
+NBCOMPATLIB=   -L${TOOLDIR}/lib -lnbcompat
 .endif
 
 .if make(install)
diff -r 070342e8e82c -r 1e76f9ece59a distrib/cdrom/macppc_installboot/Makefile
--- a/distrib/cdrom/macppc_installboot/Makefile Sun Dec 02 12:48:32 2012 +0000
+++ b/distrib/cdrom/macppc_installboot/Makefile Sun Dec 02 12:55:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2009/03/25 15:26:49 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.9 2012/12/02 12:55:27 apb Exp $
 
 HOSTPROG=      macppc_installboot
 SRCS=          installboot.c cd9660.c cd9660_util.c
@@ -24,9 +24,7 @@
 .include <bsd.own.mk>
 
 .ifndef NOCOMPATLIB
-COMPATOBJ!=    cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
-.-include      "${COMPATOBJ}/defs.mk"
-HOST_CPPFLAGS+=        -I${NETBSDSRCDIR}/tools/compat
+.-include      "${TOOLDIR}/share/compat/defs.mk"
 .endif
 
 .include <bsd.hostprog.mk>
diff -r 070342e8e82c -r 1e76f9ece59a distrib/cdrom/macppc_mkboothfs/Makefile
--- a/distrib/cdrom/macppc_mkboothfs/Makefile   Sun Dec 02 12:48:32 2012 +0000
+++ b/distrib/cdrom/macppc_mkboothfs/Makefile   Sun Dec 02 12:55:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2009/03/30 11:22:46 tsutsui Exp $
+#      $NetBSD: Makefile,v 1.5 2012/12/02 12:55:27 apb Exp $
 
 HOSTPROG=      macppc_mkboothfs
 SRCS=          mkboothfs.c
@@ -9,9 +9,7 @@
 .include <bsd.own.mk>
 
 .ifndef NOCOMPATLIB
-COMPATOBJ!=    cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
-.-include       "${COMPATOBJ}/defs.mk"
-HOST_CPPFLAGS+=        -I${NETBSDSRCDIR}/tools/compat
+.-include      "${TOOLDIR}/share/compat/defs.mk"
 .endif
 
 
diff -r 070342e8e82c -r 1e76f9ece59a external/gpl3/gcc/usr.bin/Makefile.inc
--- a/external/gpl3/gcc/usr.bin/Makefile.inc    Sun Dec 02 12:48:32 2012 +0000
+++ b/external/gpl3/gcc/usr.bin/Makefile.inc    Sun Dec 02 12:55:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.11 2012/09/18 07:05:15 skrll Exp $
+#      $NetBSD: Makefile.inc,v 1.12 2012/12/02 12:55:27 apb Exp $
 
 .ifndef _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_
 _EXTERNAL_GPL3_GCC_USR_BIN_MAKEFILE_INC_=1
@@ -24,8 +24,7 @@
 DPSRCS+= gmp.h mpfr.h mpf2mpfr.h mpc.h mpc-log.h
 
 .if ${USETOOLS} == "yes"
-COMPATOBJDIR!= cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
-NBCOMPATLIB=   -L${COMPATOBJDIR} -lnbcompat
+NBCOMPATLIB=   -L${TOOLDIR}/lib -lnbcompat
 .endif
 
 GNUHOSTDIST=   ${DIST}
diff -r 070342e8e82c -r 1e76f9ece59a gnu/usr.bin/gcc4/Makefile.inc
--- a/gnu/usr.bin/gcc4/Makefile.inc     Sun Dec 02 12:48:32 2012 +0000
+++ b/gnu/usr.bin/gcc4/Makefile.inc     Sun Dec 02 12:55:27 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.5 2011/05/30 14:41:26 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2012/12/02 12:55:27 apb Exp $
 
 .include <bsd.own.mk>
 
@@ -11,8 +11,7 @@
 HOST_CPPFLAGS+=        -I${.CURDIR}/..
 
 .if ${USETOOLS} == "yes"
-COMPATOBJDIR!= cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
-NBCOMPATLIB=   -L${COMPATOBJDIR} -lnbcompat
+NBCOMPATLIB=   -L${TOOLDIR}/lib -lnbcompat
 .endif
 
 GNUHOSTDIST=   ${DIST}