1 files changed, 6 insertions, 5 deletions
diff --git a/applets/install.sh b/applets/install.sh
index 0173e7a44..e154996e3 100755
--- a/applets/install.sh
+++ b/applets/install.sh
@@ -18,11 +18,12 @@ esac
 if [ "$DO_INSTALL_LIBS" != "n" ]; then
        # get the target dir for the libs
-        # This is an incomplete/incorrect list for now
+        # assume it starts with lib
-        case $(uname -m) in
+        libdir=$($CC -print-file-name=libc.so | \
-        x86_64|ppc64*|sparc64*|ia64*|hppa*64*|s390x*) libdir=/lib64 ;;
+                 sed -n 's%^.*\(/lib[^\/]*\)/libc.so%\1%p')
-        *) libdir=/lib ;;
+        if test -z "$libdir"; then
-        esac
+                libdir=/lib
+        fi
        mkdir -p $prefix/$libdir || exit 1
        for i in $DO_INSTALL_LIBS; do

diff --git a/applets/install.sh b/applets/install.sh index 0173e7a44..e154996e3 100755 --- a/applets/install.sh +++ b/applets/install.sh
@@ -18,11 +18,12 @@ esac
18		18
19	if [ "$DO_INSTALL_LIBS" != "n" ]; then	19	if [ "$DO_INSTALL_LIBS" != "n" ]; then
20	# get the target dir for the libs	20	# get the target dir for the libs
21	# This is an incomplete/incorrect list for now	21	# assume it starts with lib
22	case $(uname -m) in	22	libdir=$($CC -print-file-name=libc.so \| \
23	x86_64\|ppc64\|sparc64\|ia64\|hppa64\|s390x) libdir=/lib64 ;;	23	sed -n 's%^.\(/lib[^\/]\)/libc.so%\1%p')
24	*) libdir=/lib ;;	24	if test -z "$libdir"; then
25	esac	25	libdir=/lib
		26	fi
26		27
27	mkdir -p $prefix/$libdir \|\| exit 1	28	mkdir -p $prefix/$libdir \|\| exit 1
28	for i in $DO_INSTALL_LIBS; do	29	for i in $DO_INSTALL_LIBS; do