diff options
| author | jlam <jlam@pkgsrc.org> | 2005-11-07 06:52:24 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-11-07 06:52:24 +0000 |
| commit | 604a8bc47769fe66a3a623cfc639b3df947d123b (patch) | |
| tree | 6c9a2e149c86db8ae01812f40ad4e4d7098d211d /pkgtools/pkg_install | |
| parent | f2c3651333ea1e92d281a9b57ba2b866337d7c98 (diff) | |
| download | pkgsrc-604a8bc47769fe66a3a623cfc639b3df947d123b.tar.gz | |
Use the hard-coded ${PKG_TOOLS_BIN} variable as the correct location of
the pkg_admin binary.
Diffstat (limited to 'pkgtools/pkg_install')
| -rw-r--r-- | pkgtools/pkg_install/INSTALL | 5 | ||||
| -rw-r--r-- | pkgtools/pkg_install/Makefile | 3 |
2 files changed, 5 insertions, 3 deletions
diff --git a/pkgtools/pkg_install/INSTALL b/pkgtools/pkg_install/INSTALL index 5726b2a11fe..13dccce1803 100644 --- a/pkgtools/pkg_install/INSTALL +++ b/pkgtools/pkg_install/INSTALL @@ -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 @@ PRE-INSTALL) ;; 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 --git a/pkgtools/pkg_install/Makefile b/pkgtools/pkg_install/Makefile index 640451ab672..106f88924cb 100644 --- a/pkgtools/pkg_install/Makefile +++ b/pkgtools/pkg_install/Makefile @@ -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 @@ do-extract: 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} |