[uClibc-cvs] CVS uClibc/utils

[CVS User jocke]

Update of /var/cvs/uClibc/utils
In directory nail:/tmp/cvs-serv31285/utils

Modified Files:
	ldd.c 
Log Message:
Remove /usr/X11R6/lib from search path.
Search  in UCLIBC_RUNTIME_PREFIX"lib" before
UCLIBC_RUNTIME_PREFIX"usr/lib".

X11 users should enable USE_CACHE in Rules.mak, add
/usr/X11R6/lib to /etc/ld.so.conf and run ldconfig.


--- /var/cvs/uClibc/utils/ldd.c	2004/09/28 07:29:13	1.14
+++ /var/cvs/uClibc/utils/ldd.c	2004/09/28 07:56:48	1.15
@@ -338,12 +338,8 @@
 
 	/* Lastly, search the standard list of paths for the library.
 	   This list must exactly match the list in uClibc/ldso/ldso/dl-elf.c */
-	path =	UCLIBC_RUNTIME_PREFIX "usr/X11R6/lib:"
-		UCLIBC_RUNTIME_PREFIX "usr/lib:"
-		UCLIBC_RUNTIME_PREFIX "lib:"
-		"/usr/X11R6/lib:"
-		"/usr/lib:"
-		"/lib";
+	path =	UCLIBC_RUNTIME_PREFIX "lib:"
+		UCLIBC_RUNTIME_PREFIX "usr/lib";
 	search_for_named_library(lib->name, buf, path);
 	if (*buf != '\0') {
 		lib->path = buf;