diff options
| author | jlam <jlam> | 2007-08-02 16:00:33 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2007-08-02 16:00:33 +0000 |
| commit | d2666e132c3a836d8df53b48b972ebccd9276d89 (patch) | |
| tree | 19dcf5ca5333ac7cb192d5719cbe8972f19cf8f1 /mk/pkginstall | |
| parent | 76def9819068ef82d3f62758e5131ce76e651fb1 (diff) | |
| download | pkgsrc-d2666e132c3a836d8df53b48b972ebccd9276d89.tar.gz | |
Don't bother using environment variables to pass info the shlib-type
shell script. Just specify everything on the command line. Also,
since shlib-type is a plain-old shell script with no bells and whistles,
we can safely run it with "sh" and not "${SH}", which is necessary
because "${SH}" isn't defined at this point.
Diffstat (limited to 'mk/pkginstall')
| -rw-r--r-- | mk/pkginstall/bsd.pkginstall.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/pkginstall/bsd.pkginstall.mk b/mk/pkginstall/bsd.pkginstall.mk index c61eb4f5545..87977854846 100644 --- a/mk/pkginstall/bsd.pkginstall.mk +++ b/mk/pkginstall/bsd.pkginstall.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkginstall.mk,v 1.29 2007/07/27 18:37:35 jlam Exp $ +# $NetBSD: bsd.pkginstall.mk,v 1.30 2007/08/02 16:00:33 jlam Exp $ # # This Makefile fragment is included by bsd.pkg.mk and implements the # common INSTALL/DEINSTALL scripts framework. To use the pkginstall @@ -700,8 +700,8 @@ ${_INSTALL_SHELL_FILE}: ../../mk/pkginstall/shell # SHLIB_TYPE= ${_SHLIB_TYPE_cmd:sh} _SHLIB_TYPE_cmd= \ - ${SETENV} PKG_INFO_CMD=${PKG_INFO_CMD:Q} \ - ${SH} ${.CURDIR}/../../mk/scripts/shlib-type ${_OPSYS_SHLIB_TYPE:Q} + sh ${.CURDIR}/../../mk/scripts/shlib-type \ + ${_OPSYS_SHLIB_TYPE:Q} ${PKG_INFO_CMD:Q} LDCONFIG_ADD_CMD?= ${_LDCONFIG_ADD_CMD.${OPSYS}} LDCONFIG_REMOVE_CMD?= ${_LDCONFIG_REMOVE_CMD.${OPSYS}} |