[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_install Use the hard-coded ${PKG_TOOLS_BI...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/72c6f7d9bd3d
branches:  trunk
changeset: 502588:72c6f7d9bd3d
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Mon Nov 07 06:52:24 2005 +0000

description:
Use the hard-coded ${PKG_TOOLS_BIN} variable as the correct location of
the pkg_admin binary.

diffstat:

 pkgtools/pkg_install/INSTALL  |  5 +++--
 pkgtools/pkg_install/Makefile |  3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diffs (42 lines):

diff -r 1b55924995da -r 72c6f7d9bd3d pkgtools/pkg_install/INSTALL
--- a/pkgtools/pkg_install/INSTALL      Mon Nov 07 06:32:58 2005 +0000
+++ b/pkgtools/pkg_install/INSTALL      Mon Nov 07 06:52:24 2005 +0000
@@ -1,11 +1,12 @@
 #!/bin/sh
 #
-# $NetBSD: INSTALL,v 1.1 2005/11/06 22:15:44 jlam Exp $
+# $NetBSD: INSTALL,v 1.2 2005/11/07 06:52:24 jlam Exp $
 
 PKGNAME="$1"
 STAGE="$2"
 
 PKG_DBDIR="@PKG_DBDIR@"
+PKG_TOOLS_BIN="@PKG_TOOLS_BIN@"
 MKDIR="@MKDIR@"
 
 case ${STAGE} in
@@ -14,6 +15,6 @@
        ;;
 
 POST-INSTALL)
-       [ -f ${PKG_DBDIR}/pkgdb.byfile.db ] || ${PKG_PREFIX}/bin/pkg_admin rebuild
+       [ -f ${PKG_DBDIR}/pkgdb.byfile.db ] || ${PKG_TOOLS_BIN}/pkg_admin rebuild
        ;;
 esac
diff -r 1b55924995da -r 72c6f7d9bd3d pkgtools/pkg_install/Makefile
--- a/pkgtools/pkg_install/Makefile     Mon Nov 07 06:32:58 2005 +0000
+++ b/pkgtools/pkg_install/Makefile     Mon Nov 07 06:52:24 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.119 2005/11/07 06:32:58 jlam Exp $
+# $NetBSD: Makefile,v 1.120 2005/11/07 06:52:24 jlam Exp $
 
 # Notes to package maintainers:
 #
@@ -79,6 +79,7 @@
 
 post-build:
        ${SED}  -e "s|@PKG_DBDIR@|${PKG_DBDIR}|g"                       \
+               -e "s|@PKG_TOOLS_BIN@|${PKG_TOOLS_BIN}|g"               \
                -e "s|@MKDIR@|${MKDIR}|g"                               \
                ${PKGDIR}/INSTALL > ${INSTALL_FILE}
        ${CHMOD} +x ${INSTALL_FILE}