Module Name: src
Committed By: apb
Date: Sun Dec 2 12:39:56 UTC 2012
Modified Files:
src/tools/binstall: Makefile
Log Message:
In tools/binstall/Makefile, explicitly use the uninstalled copy
of libnbcompat, not the version that's installed under TOOLDIR.
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tools/binstall/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/binstall/Makefile
diff -u src/tools/binstall/Makefile:1.8 src/tools/binstall/Makefile:1.9
--- src/tools/binstall/Makefile:1.8 Sun Dec 2 12:18:16 2012
+++ src/tools/binstall/Makefile Sun Dec 2 12:39:55 2012
@@ -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_OBJ!= cd ${.CURDIR}/../host-m
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
