[src/trunk]: src/tools/binstall In tools/binstall/Makefile, explicitly use th...

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

details:   https://anonhg.NetBSD.org/src/rev/0e518b25a555
branches:  trunk
changeset: 783043:0e518b25a555
user:      apb <apb%NetBSD.org@localhost>
date:      Sun Dec 02 12:39:55 2012 +0000

description:
In tools/binstall/Makefile, explicitly use the uninstalled copy
of libnbcompat, not the version that's installed under TOOLDIR.

diffstat:

 tools/binstall/Makefile |  11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diffs (30 lines):

diff -r 940a48dd7342 -r 0e518b25a555 tools/binstall/Makefile
--- a/tools/binstall/Makefile   Sun Dec 02 12:37:08 2012 +0000
+++ b/tools/binstall/Makefile   Sun Dec 02 12:39:55 2012 +0000
@@ -1,10 +1,14 @@
-#      $NetBSD: Makefile,v 1.8 2012/12/02 12:18:16 apb Exp $
+#      $NetBSD: Makefile,v 1.9 2012/12/02 12:39:55 apb Exp $
 
 HOSTPROGNAME=  ${MACHINE_GNU_PLATFORM}-install
 HOST_SRCDIR=   usr.bin/xinstall
 CPPFLAGS+=     -I${.CURDIR}/../compat/sys
 CPPFLAGS+=     -DTARGET_STRIP=\"${STRIP}\"
 
+# Prevent Makefile.host from trying to use the version of libnbcompat
+# from ${TOOLDIR}.
+NOCOMPATLIB=
+
 .include "${.CURDIR}/../Makefile.host"
 
 # Use uninstalled copy of host-mkdep
@@ -12,5 +16,10 @@
 HOST_MKDEP=    ${HOST_MKDEP_OBJ}/host-mkdep
 MKDEP=         ${HOST_MKDEP}
 
+# Use uninstalled copy of libnbcompat and associated *.h files
+COMPATLIB_UNINSTALLED= yes
+COMPATOBJ!=    cd ${NETBSDSRCDIR}/tools/compat && ${PRINTOBJDIR}
+.-include      "${COMPATOBJ}/defs.mk"
+
 # Use uninstalled copy of the install program
 INSTALL=       ./xinstall