[src/netbsd-1-4]: src/usr.sbin/pkg_install Pull up revisions 1.9-1.10:

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

details:   https://anonhg.NetBSD.org/src/rev/aee7af7643a1
branches:  netbsd-1-4
changeset: 469397:aee7af7643a1
user:      he <he%NetBSD.org@localhost>
date:      Mon Sep 13 22:41:07 1999 +0000

description:
Pull up revisions 1.9-1.10:
  Provide full pathnames for chgrp and chown, fixing PR#8250.  (hubertf)

diffstat:

 usr.sbin/pkg_install/Makefile.inc |  28 ++++++++++++++++++++++++----
 1 files changed, 24 insertions(+), 4 deletions(-)

diffs (52 lines):

diff -r b5ad9e8ab996 -r aee7af7643a1 usr.sbin/pkg_install/Makefile.inc
--- a/usr.sbin/pkg_install/Makefile.inc Mon Sep 13 22:38:41 1999 +0000
+++ b/usr.sbin/pkg_install/Makefile.inc Mon Sep 13 22:41:07 1999 +0000
@@ -1,15 +1,25 @@
-# $NetBSD: Makefile.inc,v 1.5.2.1 1999/08/22 17:22:27 he Exp $
+# $NetBSD: Makefile.inc,v 1.5.2.2 1999/09/13 22:41:07 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} -DBINDIR='"${BINDIR}"'
 
-.if !defined(OS)
-OS!= uname -s
+.if !defined(OPSYS)
+.if exists(/usr/bin/uname)
+OPSYS!= /usr/bin/uname -s
+.elif exists(/bin/uname)
+OPSYS!= /bin/uname -s
+.else
+OPSYS="unknown"
+.endif
 .endif
 
-.if ${OS} == "SunOS.5"
+.if ${OPSYS} == "NetBSD"
+CHMOD= /bin/chmod
+CHOWN= /usr/sbin/chown
+CHGRP= /usr/bin/chgrp
+.elif ${OPSYS} == "SunOS"
 .if exists(/etc/mk.conf)
 .include "/etc/mk.conf"
 .endif
@@ -18,8 +28,18 @@
 TAR_FULLPATHNAME?= ${LOCALBASE}/bin/${TAR_CMD}
 CPPFLAGS+=-DTAR_CMD='"${TAR_CMD}"' -DTAR_FULLPATHNAME='"${TAR_FULLPATHNAME}"'
 BINDIR=${LOCALBASE}/bsd/bin
+CHMOD= /usr/bin/chmod
+CHOWN= /usr/bin/chown
+CHGRP= /usr/bin/chgrp
+WARNS=0
+.elif ${OPSYS} == "Linux"
+CHMOD= /bin/chmod
+CHOWN= /bin/chown
+CHGRP= /bin/chgrp
 .endif
 
+CPPFLAGS+= -DCHMOD='"${CHMOD}"' -DCHOWN='"${CHOWN}"' -DCHGRP='"${CHGRP}"'
+
 DPADD+=        ${LIBINSTALL}/libinstall.a
 LDADD+=        -L${LIBINSTALL} -linstall