--- elwix/config/rc.subr	2014/01/21 16:33:40	1.8.2.3
+++ elwix/config/rc.subr	2014/01/22 09:32:01	1.8.2.4
@@ -4,7 +4,7 @@
 # (C) AITNET ltd - Sofia/Bulgaria <office@aitnet.org>
 #    by Michael Pounov <misho@elwix.org>
 #
-# $Id: rc.subr,v 1.8.2.3 2014/01/21 16:33:40 misho Exp $
+# $Id: rc.subr,v 1.8.2.4 2014/01/22 09:32:01 misho Exp $
 #
 
 ### Dont edit this file !!!
@@ -225,7 +225,7 @@ InstallList()
 	for i in $(cat $TMPFILE); do
 		if [ -x $i ]; then
 			echo "Strip '$i'"
-			strip -s $i
+			${CEXEC} strip -s $i
 		fi
 	done
 	cd -
@@ -266,9 +266,18 @@ InstallFiles()
 InstallLibs()
 {
 	${CEXEC} find -X $2 ! -name "*.ko" -and -type f -and -perm +111 | \
-		xargs ldd -f "%p\n" 2> /dev/null | sort | uniq | \
-		sed 's|^/||' >${DEST}/elwix_mklibs.conf
-	InstallList ${DEST}/elwix_mklibs.conf $1 $2
+		xargs readelf -d 2>&- | grep "NEEDED" | sort | uniq | \
+		awk '($2 == "(NEEDED)") { print substr($5, 2, length($5) - 2); }' \
+		2>/dev/null >${DEST}/elwix_mklibs.tmp
+	for i in $(cat ${DEST}/elwix_mklibs.tmp); do
+		echo $i
+		${CEXEC} find $1 -type f -name $i -exec install -v {} $LIBS \\\;
+		${CEXEC} strip -s $LIBS/$i
+	done
+#	${CEXEC} find -X $2 ! -name "*.ko" -and -type f -and -perm +111 | \
+#		xargs ldd -f "%p\n" 2> /dev/null | sort | uniq | \
+#		sed 's|^/||' >${DEST}/elwix_mklibs.conf
+#	InstallList ${DEST}/elwix_mklibs.conf $1 $2
 }
 
 # $1 = Directory for clean
@@ -294,7 +303,7 @@ StripFiles()
 		for i in $(cat $TMPFILE); do
 			if [ -x $i ]; then
 				echo "Strip '$i'"
-				strip -s $i
+				${CEXEC} strip -s $i
 			fi
 		done
 		cd -