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.

1 files changed, 10 insertions, 11 deletions

diff --git a/mk/scripts/shlib-type b/mk/scripts/shlib-type
index f6626a85843..4bcc2f8bf84 100755
--- a/mk/scripts/shlib-type
+++ b/mk/scripts/shlib-type
@@ -1,33 +1,32 @@
 # /bin/sh
 #
-# $NetBSD: shlib-type,v 1.2 2007/08/02 15:46:33 jlam Exp $
+# $NetBSD: shlib-type,v 1.3 2007/08/02 16:00:33 jlam Exp $
 #
 # This code is derived from software contributed to The NetBSD Foundation
 # by Alistair Crooks.
 #
 # This script returns the the library format for the platform.  If
-# the library format is "ELF/a.out", then we inspect "pkg_info" (which
-# should exist on a pkgsrc system) to determine the correct object
-# format (either ELF or a.out).
+# the library format is "ELF/a.out", then we inspect the specified
+# path to determine the correct object format (either ELF or a.out).
 #
 
 if [ -z "${FILE_CMD}" ]; then
 	FILE_CMD=file
 fi
-if [ -z "${PKG_INFO_CMD}" ]; then
-	PKG_INFO_CMD=/usr/sbin/pkg_info
-fi
 
-if [ $# -eq 0 ]; then
-	echo 1>&2 "usage: shlib-type libformat"
+if [ $# -lt 2 ]; then
+	echo 1>&2 "usage: shlib-type libformat binpath"
 	exit 1
 fi
 
+libformat="$1"
+binpath="$2"
+
 sotype=none
 case "$1" in
 ELF/a.out)
-	if [ -f "${PKG_INFO_CMD}" ]; then
-		output=`${FILE_CMD} ${PKG_INFO_CMD} 2>/dev/null`
+	if [ -f "$binpath" ]; then
+		output=`${FILE_CMD} $binpath 2>/dev/null`
 	else
 		output=
 	fi