[src/netbsd-1-6]: src/usr.sbin/pkg_install Pull up revision 1.22 (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/6a60bf8d0820
branches:  netbsd-1-6
changeset: 529528:6a60bf8d0820
user:      tron <tron%NetBSD.org@localhost>
date:      Sun Nov 24 22:34:45 2002 +0000

description:
Pull up revision 1.22 (requested by jschauma in ticket #1011):
- eliminate the hard-coding of pathnames in the default install.
- all command executions now use the path [execvp/execlp/system].
- normalize the macro names as <COMMAND>_CMD.
- in some OS's full pathnames for commands can still be provided, but this
  is not the default.
This was needed to fix -DTAR_FULLPATHNAME="/usr/bin/tar"

diffstat:

 usr.sbin/pkg_install/Makefile.inc |  32 +++++++++++++++-----------------
 1 files changed, 15 insertions(+), 17 deletions(-)

diffs (57 lines):

diff -r b932c097917b -r 6a60bf8d0820 usr.sbin/pkg_install/Makefile.inc
--- a/usr.sbin/pkg_install/Makefile.inc Sun Nov 24 22:34:38 2002 +0000
+++ b/usr.sbin/pkg_install/Makefile.inc Sun Nov 24 22:34:45 2002 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.16.2.4 2002/11/24 13:52:20 tron Exp $
+# $NetBSD: Makefile.inc,v 1.16.2.5 2002/11/24 22:34:45 tron Exp $
 # Original from FreeBSD, no rcs id.
 
 .include <bsd.own.mk>
@@ -8,33 +8,31 @@
 
 # If building for Zoularis on Solaris, some other Makefile should do:
 #LOCALBASE?= /usr/pkg
-#TAR_CMD?= tar
-#FTP_CMD?= ftp
 #ZOULARISBASE?=  ${LOCALBASE}/bsd
-#TAR_FULLPATHNAME?= ${ZOULARISBASE}/bin/${TAR_CMD}
-#FTP_FULLPATHNAME?= ${ZOULARISBASE}/bin/${FTP_CMD}
-#CPPFLAGS+=-DTAR_CMD='"${TAR_CMD}"' -DTAR_FULLPATHNAME='"${TAR_FULLPATHNAME}"'
-#CPPFLAGS+=-DFTP_CMD='"${FTP_CMD}"' -DFTP_FULLPATHNAME='"${FTP_FULLPATHNAME}"'
 #BINDIR=${ZOULARISBASE}/bin
-#CHMOD?= /usr/bin/chmod
-#CHOWN?= /usr/bin/chown
-#CHGRP?= /usr/bin/chgrp
+#TAR_CMD?= ${BINDIR}/tar
+#FTP_CMD?= ${BINDIR}/ftp
+#CPPFLAGS+=-DTAR_CMD='"${TAR_CMD}"' -DFTP_CMD='"${FTP_CMD}"'
+#CHMOD_CMD?= /usr/bin/chmod
+#CHOWN_CMD?= /usr/bin/chown
+#CHGRP_CMD?= /usr/bin/chgrp
 #WARNS=0
 
 # If building for Zoularis on Linux, some other Makefile should do:
-#CHMOD?= /bin/chmod
-#CHOWN?= /bin/chown
-#CHGRP?= /bin/chgrp
+#CHMOD_CMD?= /bin/chmod
+#CHOWN_CMD?= /bin/chown
+#CHGRP_CMD?= /bin/chgrp
 
 # UNDER NO CIRCUMSTANCES SHOULD THIS MAKEFILE TEST THE OUTPUT OF uname!!
 # DOING SO BREAKS CROSS COMPILING.
 
-CHMOD?= /bin/chmod
-CHOWN?= /usr/sbin/chown
-CHGRP?= /usr/bin/chgrp
+#CHMOD_CMD?= /bin/chmod
+#CHOWN_CMD?= /usr/sbin/chown
+#CHGRP_CMD?= /usr/bin/chgrp
 WARNS=2
 
-CPPFLAGS+= -DCHMOD='"${CHMOD}"' -DCHOWN='"${CHOWN}"' -DCHGRP='"${CHGRP}"'
+#CPPFLAGS+= -DCHMOD_CMD='"${CHMOD_CMD}"' -DCHOWN_CMD='"${CHOWN_CMD}"'
+#CPPFLAGS+= -DCHGRP_CMD='"${CHGRP_CMD}"'
 
 DPADD+=        ${LIBINSTALL}/libinstall.a
 LDADD+=        -L${LIBINSTALL} -linstall