Module Name: src
Committed By: christos
Date: Sun Jan 12 21:27:45 UTC 2020
Modified Files:
src/tools/pkg_install: Makefile Makefile.inc
src/tools/pkg_install/pkg_add: Makefile
src/tools/pkg_install/pkg_admin: Makefile
src/tools/pkg_install/pkg_create: Makefile
src/tools/pkg_install/pkg_delete: Makefile
src/tools/pkg_install/pkg_info: Makefile
Log Message:
make this compile.
To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 src/tools/pkg_install/Makefile \
src/tools/pkg_install/Makefile.inc
cvs rdiff -u -r1.1 -r1.2 src/tools/pkg_install/pkg_add/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tools/pkg_install/pkg_admin/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tools/pkg_install/pkg_create/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tools/pkg_install/pkg_delete/Makefile
cvs rdiff -u -r1.1 -r1.2 src/tools/pkg_install/pkg_info/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/pkg_install/Makefile
diff -u src/tools/pkg_install/Makefile:1.1 src/tools/pkg_install/Makefile:1.2
--- src/tools/pkg_install/Makefile:1.1 Tue Dec 1 04:01:45 2009
+++ src/tools/pkg_install/Makefile Sun Jan 12 16:27:43 2020
@@ -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>
Index: src/tools/pkg_install/Makefile.inc
diff -u src/tools/pkg_install/Makefile.inc:1.1 src/tools/pkg_install/Makefile.inc:1.2
--- src/tools/pkg_install/Makefile.inc:1.1 Tue Dec 1 04:01:45 2009
+++ src/tools/pkg_install/Makefile.inc Sun Jan 12 16:27:43 2020
@@ -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"
+
+INSTALL_OBJDIR!= cd ${NETBSDSRCDIR}/tools/pkg_install/lib && ${PRINTOBJDIR}
+LDFLAGS+=-L${INSTALL_OBJDIR}
+LDADD+=-linstall
-.include "${NETBSDSRCDIR}/external/bsd/pkg_install/sbin/Makefile.inc"
Index: src/tools/pkg_install/pkg_add/Makefile
diff -u src/tools/pkg_install/pkg_add/Makefile:1.1 src/tools/pkg_install/pkg_add/Makefile:1.2
--- src/tools/pkg_install/pkg_add/Makefile:1.1 Tue Dec 1 04:01:46 2009
+++ src/tools/pkg_install/pkg_add/Makefile Sun Jan 12 16:27:44 2020
@@ -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"
Index: src/tools/pkg_install/pkg_admin/Makefile
diff -u src/tools/pkg_install/pkg_admin/Makefile:1.1 src/tools/pkg_install/pkg_admin/Makefile:1.2
--- src/tools/pkg_install/pkg_admin/Makefile:1.1 Tue Dec 1 04:01:46 2009
+++ src/tools/pkg_install/pkg_admin/Makefile Sun Jan 12 16:27:44 2020
@@ -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"
Index: src/tools/pkg_install/pkg_create/Makefile
diff -u src/tools/pkg_install/pkg_create/Makefile:1.1 src/tools/pkg_install/pkg_create/Makefile:1.2
--- src/tools/pkg_install/pkg_create/Makefile:1.1 Tue Dec 1 04:01:46 2009
+++ src/tools/pkg_install/pkg_create/Makefile Sun Jan 12 16:27:44 2020
@@ -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"
Index: src/tools/pkg_install/pkg_delete/Makefile
diff -u src/tools/pkg_install/pkg_delete/Makefile:1.1 src/tools/pkg_install/pkg_delete/Makefile:1.2
--- src/tools/pkg_install/pkg_delete/Makefile:1.1 Tue Dec 1 04:01:46 2009
+++ src/tools/pkg_install/pkg_delete/Makefile Sun Jan 12 16:27:45 2020
@@ -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"
Index: src/tools/pkg_install/pkg_info/Makefile
diff -u src/tools/pkg_install/pkg_info/Makefile:1.1 src/tools/pkg_install/pkg_info/Makefile:1.2
--- src/tools/pkg_install/pkg_info/Makefile:1.1 Tue Dec 1 04:01:46 2009
+++ src/tools/pkg_install/pkg_info/Makefile Sun Jan 12 16:27:45 2020
@@ -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"
