[src/trunk]: src/tools/pkg_install make this compile.

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

details:   https://anonhg.NetBSD.org/src/rev/e56276686fc9
branches:  trunk
changeset: 467076:e56276686fc9
user:      christos <christos%NetBSD.org@localhost>
date:      Sun Jan 12 21:27:43 2020 +0000

description:
make this compile.

diffstat:

 tools/pkg_install/Makefile            |  5 ++---
 tools/pkg_install/Makefile.inc        |  9 +++++++--
 tools/pkg_install/pkg_add/Makefile    |  7 ++++---
 tools/pkg_install/pkg_admin/Makefile  |  7 ++++---
 tools/pkg_install/pkg_create/Makefile |  7 ++++---
 tools/pkg_install/pkg_delete/Makefile |  7 ++++---
 tools/pkg_install/pkg_info/Makefile   |  7 ++++---
 7 files changed, 29 insertions(+), 20 deletions(-)

diffs (106 lines):

diff -r f5fe4543335e -r e56276686fc9 tools/pkg_install/Makefile
--- a/tools/pkg_install/Makefile        Sun Jan 12 20:49:21 2020 +0000
+++ b/tools/pkg_install/Makefile        Sun Jan 12 21:27:43 2020 +0000
@@ -1,6 +1,5 @@
-#      $NetBSD: Makefile,v 1.1 2009/12/01 09:01:45 uebayasi Exp $
+#      $NetBSD: Makefile,v 1.2 2020/01/12 21:27:43 christos Exp $
 
-SUBDIR=        lib .WAIT pkg_add pkg_create pkg_delete pkg_info
-# XXX pkg_admin
+SUBDIR=        lib .WAIT pkg_add pkg_admin pkg_create pkg_delete pkg_info
 
 .include <bsd.subdir.mk>
diff -r f5fe4543335e -r e56276686fc9 tools/pkg_install/Makefile.inc
--- a/tools/pkg_install/Makefile.inc    Sun Jan 12 20:49:21 2020 +0000
+++ b/tools/pkg_install/Makefile.inc    Sun Jan 12 21:27:43 2020 +0000
@@ -1,3 +1,8 @@
-HOST_LDFLAGS:= -L../lib -linstall
+# $NetBSD: Makefile.inc,v 1.2 2020/01/12 21:27:43 christos Exp $
+
+.include "${NETBSDSRCDIR}/external/bsd/pkg_install/Makefile.inc"
 
-.include "${NETBSDSRCDIR}/external/bsd/pkg_install/sbin/Makefile.inc"
+INSTALL_OBJDIR!= cd ${NETBSDSRCDIR}/tools/pkg_install/lib && ${PRINTOBJDIR}
+LDFLAGS+=-L${INSTALL_OBJDIR}
+LDADD+=-linstall
+
diff -r f5fe4543335e -r e56276686fc9 tools/pkg_install/pkg_add/Makefile
--- a/tools/pkg_install/pkg_add/Makefile        Sun Jan 12 20:49:21 2020 +0000
+++ b/tools/pkg_install/pkg_add/Makefile        Sun Jan 12 21:27:43 2020 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2009/12/01 09:01:46 uebayasi Exp $
+#      $NetBSD: Makefile,v 1.2 2020/01/12 21:27:44 christos Exp $
+
+.include <bsd.own.mk>
 
 HOSTPROGNAME=  ${_TOOL_PREFIX}pkg_add
-HOST_SRCDIR=   external/bsd/pkg_install/sbin/pkg_add
+HOST_SRCDIR=   ../external/bsd/pkg_install/sbin/pkg_add
 
 .include "${.CURDIR}/../Makefile.inc"
-
 .include "${.CURDIR}/../../Makefile.host"
diff -r f5fe4543335e -r e56276686fc9 tools/pkg_install/pkg_admin/Makefile
--- a/tools/pkg_install/pkg_admin/Makefile      Sun Jan 12 20:49:21 2020 +0000
+++ b/tools/pkg_install/pkg_admin/Makefile      Sun Jan 12 21:27:43 2020 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2009/12/01 09:01:46 uebayasi Exp $
+#      $NetBSD: Makefile,v 1.2 2020/01/12 21:27:44 christos Exp $
+
+.include <bsd.own.mk>
 
 HOSTPROGNAME=  ${_TOOL_PREFIX}pkg_admin
-HOST_SRCDIR=   external/bsd/pkg_install/sbin/pkg_admin
+HOST_SRCDIR=   ../external/bsd/pkg_install/sbin/pkg_admin
 
 .include "${.CURDIR}/../Makefile.inc"
-
 .include "${.CURDIR}/../../Makefile.host"
diff -r f5fe4543335e -r e56276686fc9 tools/pkg_install/pkg_create/Makefile
--- a/tools/pkg_install/pkg_create/Makefile     Sun Jan 12 20:49:21 2020 +0000
+++ b/tools/pkg_install/pkg_create/Makefile     Sun Jan 12 21:27:43 2020 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2009/12/01 09:01:46 uebayasi Exp $
+#      $NetBSD: Makefile,v 1.2 2020/01/12 21:27:44 christos Exp $
+
+.include <bsd.own.mk>
 
 HOSTPROGNAME=  ${_TOOL_PREFIX}pkg_create
-HOST_SRCDIR=   external/bsd/pkg_install/sbin/pkg_create
+HOST_SRCDIR=   ../external/bsd/pkg_install/sbin/pkg_create
 
 .include "${.CURDIR}/../Makefile.inc"
-
 .include "${.CURDIR}/../../Makefile.host"
diff -r f5fe4543335e -r e56276686fc9 tools/pkg_install/pkg_delete/Makefile
--- a/tools/pkg_install/pkg_delete/Makefile     Sun Jan 12 20:49:21 2020 +0000
+++ b/tools/pkg_install/pkg_delete/Makefile     Sun Jan 12 21:27:43 2020 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2009/12/01 09:01:46 uebayasi Exp $
+#      $NetBSD: Makefile,v 1.2 2020/01/12 21:27:45 christos Exp $
+
+.include <bsd.own.mk>
 
 HOSTPROGNAME=  ${_TOOL_PREFIX}pkg_delete
-HOST_SRCDIR=   external/bsd/pkg_install/sbin/pkg_delete
+HOST_SRCDIR=   ../external/bsd/pkg_install/sbin/pkg_delete
 
 .include "${.CURDIR}/../Makefile.inc"
-
 .include "${.CURDIR}/../../Makefile.host"
diff -r f5fe4543335e -r e56276686fc9 tools/pkg_install/pkg_info/Makefile
--- a/tools/pkg_install/pkg_info/Makefile       Sun Jan 12 20:49:21 2020 +0000
+++ b/tools/pkg_install/pkg_info/Makefile       Sun Jan 12 21:27:43 2020 +0000
@@ -1,8 +1,9 @@
-#      $NetBSD: Makefile,v 1.1 2009/12/01 09:01:46 uebayasi Exp $
+#      $NetBSD: Makefile,v 1.2 2020/01/12 21:27:45 christos Exp $
+
+.include <bsd.own.mk>
 
 HOSTPROGNAME=  ${_TOOL_PREFIX}pkg_info
-HOST_SRCDIR=   external/bsd/pkg_install/sbin/pkg_info
+HOST_SRCDIR=   ../external/bsd/pkg_install/sbin/pkg_info
 
 .include "${.CURDIR}/../Makefile.inc"
-
 .include "${.CURDIR}/../../Makefile.host"