From: Rob Landley <rob@landley.net>
Date: Fri, 24 Mar 2006 02:42:58 +0000 (-0000)
Subject: When cross-compiling, the install directory for shared libraries has to come
X-Git-Tag: 1_1_0~30
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=d1968672ef0d0475179ca717983616a89d318ec2;p=oweals%2Fbusybox.git

When cross-compiling, the install directory for shared libraries has to come
from gcc (target machine), not uname (host machine).
---

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
-	case $(uname -m) in
-	x86_64|ppc64*|sparc64*|ia64*|hppa*64*|s390x*) libdir=/lib64 ;;
-	*) libdir=/lib ;;
-	esac
+	# assume it starts with lib
+	libdir=$($CC -print-file-name=libc.so | \
+		 sed -n 's%^.*\(/lib[^\/]*\)/libc.so%\1%p')
+	if test -z "$libdir"; then
+		libdir=/lib
+	fi
 
 	mkdir -p $prefix/$libdir || exit 1
 	for i in $DO_INSTALL_LIBS; do