summaryrefslogtreecommitdiff
path: root/mk/pkginstall
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2007-08-02 16:00:33 +0000
committerjlam <jlam@pkgsrc.org>2007-08-02 16:00:33 +0000
commit21129d3f69e09fb0ddad8790ba1a1efa2905add5 (patch)
tree19dcf5ca5333ac7cb192d5719cbe8972f19cf8f1 /mk/pkginstall
parent75b9a802514853f9855e124bd0e766a4b3207579 (diff)
downloadpkgsrc-21129d3f69e09fb0ddad8790ba1a1efa2905add5.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.mk6
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}}