[src/netbsd-1-4]: src/usr.sbin/pkg_install Pull up 1.5-1.8:

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

details:   https://anonhg.NetBSD.org/src/rev/a57db29abbce
branches:  netbsd-1-4
changeset: 469257:a57db29abbce
user:      he <he%NetBSD.org@localhost>
date:      Sun Aug 22 17:22:27 1999 +0000

description:
Pull up 1.5-1.8:
  Pass BINDIR instead of hardcoding /usr/sbin.
  Make this work on Solaris "out of the box".
>From hubertf.

diffstat:

 usr.sbin/pkg_install/Makefile.inc |  20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

diffs (31 lines):

diff -r dc09d2298fe2 -r a57db29abbce usr.sbin/pkg_install/Makefile.inc
--- a/usr.sbin/pkg_install/Makefile.inc Sun Aug 22 17:05:54 1999 +0000
+++ b/usr.sbin/pkg_install/Makefile.inc Sun Aug 22 17:22:27 1999 +0000
@@ -1,9 +1,25 @@
-# $NetBSD: Makefile.inc,v 1.5 1997/10/25 06:58:29 lukem Exp $
+# $NetBSD: Makefile.inc,v 1.5.2.1 1999/08/22 17:22:27 he Exp $
 # Original from Freebsd, no rcs id.
 
 LIBINSTALL != cd ${.CURDIR}/../lib;\
     printf "xxx: .MAKE\n\t@echo \$${.OBJDIR}\n" | ${MAKE} -s -f-
-CPPFLAGS+=-I${.CURDIR}/../lib ${DEBUG}
+CPPFLAGS+=-I${.CURDIR}/../lib ${DEBUG} -DBINDIR='"${BINDIR}"'
+
+.if !defined(OS)
+OS!= uname -s
+.endif
+
+.if ${OS} == "SunOS.5"
+.if exists(/etc/mk.conf)
+.include "/etc/mk.conf"
+.endif
+LOCALBASE?= /usr/local
+TAR_CMD?= gtar
+TAR_FULLPATHNAME?= ${LOCALBASE}/bin/${TAR_CMD}
+CPPFLAGS+=-DTAR_CMD='"${TAR_CMD}"' -DTAR_FULLPATHNAME='"${TAR_FULLPATHNAME}"'
+BINDIR=${LOCALBASE}/bsd/bin
+.endif
+
 DPADD+=        ${LIBINSTALL}/libinstall.a
 LDADD+=        -L${LIBINSTALL} -linstall