--- trunk/mage/usr/lib/mage/autodepend.sh	2012/01/13 18:45:35	1644
+++ trunk/mage/usr/lib/mage/autodepend.sh	2013/10/25 06:48:57	2268
@@ -1,6 +1,7 @@
 #!/bin/bash
+# $Id$
 
-SCANELF="scanelf -nyRB"
+SCANELF="scanelf -LnyRB"
 BINDIR="$1"
 
 if [[ -z ${BINDIR} ]]
@@ -25,10 +26,17 @@
 	local soname
 	local deps
 	local i
+	local prefix
+
+	# if /lib /lib64 are symlinks than add a prefix to honor usr-move
+	if [[ -L /lib ]] || [[ -L /lib64 ]]
+	then   
+		prefix="/usr"
+	fi
 
 	for soname in ${SONAME_LIST}
 	do
-		deps+=" $(magequery -f ${soname})"
+		deps+=" $(magequery -e ${prefix}${soname})"
 	done
 	DEPNAME_LIST="$(for i in ${deps}; do echo ${i}; done | sort -u)"
 	export DEPNAME_LIST
@@ -38,4 +46,4 @@
 build_dep_list
 
 #echo "${SONAME_LIST}"
-echo  "${DEPNAME_LIST}" | sed 's:\(.*\)-r.*:>= \1:'
+echo "${DEPNAME_LIST}" | sed 's:\(.*\)-r.*:>= \1:'