[Glibc-bsd-commits] r1833 - in trunk: glibc-2.3-head/sysdeps/kfreebsd glibc-ports/kfreebsd

[Aurelien Jarno]

Author: aurel32
Date: 2007-01-04 02:19:24 +0100 (Thu, 04 Jan 2007)
New Revision: 1833

Modified:
   trunk/glibc-2.3-head/sysdeps/kfreebsd/ldconfig.h
   trunk/glibc-ports/kfreebsd/ldconfig.h
Log:
Fix ldconfig.h...



Modified: trunk/glibc-2.3-head/sysdeps/kfreebsd/ldconfig.h
===================================================================
--- trunk/glibc-2.3-head/sysdeps/kfreebsd/ldconfig.h	2007-01-02 19:58:05 UTC (rev 1832)
+++ trunk/glibc-2.3-head/sysdeps/kfreebsd/ldconfig.h	2007-01-04 01:19:24 UTC (rev 1833)
@@ -19,9 +19,8 @@
 #include <sysdeps/generic/ldconfig.h>
 
 #define SYSDEP_KNOWN_INTERPRETER_NAMES \
-  { "/usr/lib/ld.so.1", FLAG_ELF_LIBC6 },			\
-  { "/gnu/usr/lib/ld.so.1", FLAG_ELF_LIBC6 },	/* temporary */	\
-  { "/usr/libexec/ld-elf.so.1", FLAG_ELF_LIBC5 },
+  { "/lib/ld.so.1", FLAG_ELF_LIBC6 },				\
+  { "/libexec/ld-elf.so.1", FLAG_ELF_LIBC5 },
 
 #define SYSDEP_KNOWN_LIBRARY_NAMES \
   { "libc.so.6", FLAG_ELF_LIBC6 },		/* temporary */	\

Modified: trunk/glibc-ports/kfreebsd/ldconfig.h
===================================================================
--- trunk/glibc-ports/kfreebsd/ldconfig.h	2007-01-02 19:58:05 UTC (rev 1832)
+++ trunk/glibc-ports/kfreebsd/ldconfig.h	2007-01-04 01:19:24 UTC (rev 1833)
@@ -19,9 +19,8 @@
 #include <sysdeps/generic/ldconfig.h>
 
 #define SYSDEP_KNOWN_INTERPRETER_NAMES \
-  { "/usr/lib/ld.so.1", FLAG_ELF_LIBC6 },			\
-  { "/gnu/usr/lib/ld.so.1", FLAG_ELF_LIBC6 },	/* temporary */	\
-  { "/usr/libexec/ld-elf.so.1", FLAG_ELF_LIBC5 },
+  { "/lib/ld.so.1", FLAG_ELF_LIBC6 },				\
+  { "/libexec/ld-elf.so.1", FLAG_ELF_LIBC5 },
 
 #define SYSDEP_KNOWN_LIBRARY_NAMES \
   { "libc.so.6", FLAG_ELF_LIBC6 },		/* temporary */	\