Index: Makefile.inc1
===========================================================================
--- Makefile.inc1	2003/08/11 22:55:52	#158
+++ Makefile.inc1	2003/08/11 22:55:52
@@ -283,7 +283,7 @@
 	mkdir -p ${WORLDTMP}/legacy/${_dir}
 .endfor
 .for _dir in \
-    usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
+    lib usr/bin usr/include usr/lib/compat/aout usr/libdata/ldscripts \
     usr/libexec usr/share/misc
 	mkdir -p ${WORLDTMP}/${_dir}
 .endfor
Index: bin/Makefile.inc
===========================================================================
--- bin/Makefile.inc	2003/08/11 22:55:52	#6
+++ bin/Makefile.inc	2003/08/11 22:55:52
@@ -2,5 +2,8 @@
 # $FreeBSD: src/bin/Makefile.inc,v 1.16 2003/06/13 07:04:01 markm Exp $
 
 BINDIR?=	/bin
+WARNS?=		6
+
+.if !defined (WITH_DYNAMICROOT)
 NOSHARED?=	YES
-WARNS?=		6
+.endif
Index: contrib/gcc/config/alpha/freebsd.h
===========================================================================
--- contrib/gcc/config/alpha/freebsd.h	2003/08/11 22:55:52	#9
+++ contrib/gcc/config/alpha/freebsd.h	2003/08/11 22:55:52
@@ -51,7 +51,7 @@
   %{!shared:								\
     %{!static:								\
       %{rdynamic:-export-dynamic}					\
-      %{!dynamic-linker:-dynamic-linker /usr/libexec/ld-elf.so.1}}	\
+      %{!dynamic-linker:-dynamic-linker /libexec/ld-elf.so.1}}		\
     %{static:-Bstatic}}"
 
 /* We now have to provide a STARTFILE_SPEC because of a moronic pigheaded
Index: contrib/gcc/config/i386/freebsd.h
===========================================================================
--- contrib/gcc/config/i386/freebsd.h	2003/08/11 22:55:52	#24
+++ contrib/gcc/config/i386/freebsd.h	2003/08/11 22:55:52
@@ -54,7 +54,7 @@
     %{!shared: \
       %{!static: \
 	%{rdynamic: -export-dynamic} \
-	%{!dynamic-linker: -dynamic-linker /usr/libexec/ld-elf.so.1}} \
+	%{!dynamic-linker: -dynamic-linker /libexec/ld-elf.so.1}} \
       %{static:-Bstatic}} \
     %{symbolic:-Bsymbolic}"
 
Index: contrib/gcc/config/i386/freebsd64.h
===========================================================================
--- contrib/gcc/config/i386/freebsd64.h	2003/08/11 22:55:52	#4
+++ contrib/gcc/config/i386/freebsd64.h	2003/08/11 22:55:52
@@ -39,6 +39,6 @@
     %{!shared: \
       %{!static: \
         %{rdynamic:-export-dynamic} \
-	%{!dynamic-linker:-dynamic-linker /usr/libexec/ld-elf.so.1}} \
+	%{!dynamic-linker:-dynamic-linker /libexec/ld-elf.so.1}} \
     %{static:-Bstatic}} \
   %{symbolic:-Bsymbolic}"
Index: contrib/gcc/config/ia64/freebsd.h
===========================================================================
--- contrib/gcc/config/ia64/freebsd.h	2003/08/11 22:55:52	#3
+++ contrib/gcc/config/ia64/freebsd.h	2003/08/11 22:55:52
@@ -28,7 +28,7 @@
   %{!shared:								\
     %{!static:								\
       %{rdynamic:-export-dynamic}					\
-      %{!dynamic-linker:-dynamic-linker /usr/libexec/ld-elf.so.1}}	\
+      %{!dynamic-linker:-dynamic-linker /libexec/ld-elf.so.1}}		\
     %{static:-Bstatic}}"
 
 
Index: contrib/gcc/config/sparc/freebsd.h
===========================================================================
--- contrib/gcc/config/sparc/freebsd.h	2003/08/11 22:55:52	#7
+++ contrib/gcc/config/sparc/freebsd.h	2003/08/11 22:55:52
@@ -41,7 +41,7 @@
   %{!shared:								\
     %{!static:								\
       %{rdynamic:-export-dynamic}					\
-      %{!dynamic-linker:-dynamic-linker /usr/libexec/ld-elf.so.1}}	\
+      %{!dynamic-linker:-dynamic-linker /libexec/ld-elf.so.1}}		\
     %{static:-Bstatic}}"
 
 
Index: etc/mtree/BSD.root.dist
===========================================================================
--- etc/mtree/BSD.root.dist	2003/08/11 22:55:52	#10
+++ etc/mtree/BSD.root.dist	2003/08/11 22:55:52
@@ -59,6 +59,10 @@
         ssl
         ..
     ..
+    lib
+    ..
+    libexec
+    ..
     mnt
     ..
     proc            mode=0555
Index: etc/rc.d/ldconfig
===========================================================================
--- etc/rc.d/ldconfig	2003/08/11 22:55:52	#7
+++ etc/rc.d/ldconfig	2003/08/11 22:55:52
@@ -24,7 +24,7 @@
 		ldconfig=${ldconfig_command}
 		checkyesno ldconfig_insecure && _ins="-i"
 		if [ -x "${ldconfig_command}" ]; then
-			_LDC=/usr/lib
+			_LDC="/lib /usr/lib"
 			for i in ${ldconfig_paths} /etc/ld-elf.so.conf; do
 				if [ -r "${i}" ]; then
 					_LDC="${_LDC} ${i}"
Index: gnu/lib/libreadline/readline/Makefile
===========================================================================
--- gnu/lib/libreadline/readline/Makefile	2003/08/11 22:55:52	#3
+++ gnu/lib/libreadline/readline/Makefile	2003/08/11 22:55:52
@@ -4,6 +4,7 @@
 
 LIB=    readline
 MAN=    doc/readline.3
+SHLIBDIR?=	/lib
 
 TILDESRC= tilde.c
 SRCS=     readline.c vi_mode.c funmap.c keymaps.c parens.c search.c \
Index: lib/libalias/Makefile
===========================================================================
--- lib/libalias/Makefile	2003/08/11 22:55:52	#3
+++ lib/libalias/Makefile	2003/08/11 22:55:52
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/libalias/Makefile,v 1.20 2003/04/20 18:38:59 obrien Exp $
 
 LIB=	alias
+SHLIBDIR?=	/lib
 SHLIB_MAJOR=	4
 MAN=	libalias.3
 SRCS=	alias.c alias_cuseeme.c alias_db.c alias_ftp.c alias_irc.c \
Index: lib/libatm/Makefile
===========================================================================
--- lib/libatm/Makefile	2003/08/11 22:55:52	#4
+++ lib/libatm/Makefile	2003/08/11 22:55:52
@@ -28,6 +28,7 @@
 #
 
 LIB=	atm
+SHLIBDIR?=	/lib
 SRCS=	atm_addr.c cache_key.c ioctl_subr.c ip_addr.c ip_checksum.c timer.c
 INCS=	libatm.h
 
Index: lib/libc/Makefile
===========================================================================
--- lib/libc/Makefile	2003/08/11 22:55:52	#11
+++ lib/libc/Makefile	2003/08/11 22:55:52
@@ -10,6 +10,7 @@
 # system call stubs.
 LIB=c
 SHLIB_MAJOR= 5
+SHLIBDIR?=/lib
 CFLAGS+=-I${.CURDIR}/include -I${.CURDIR}/../../include
 CFLAGS+=-I${.CURDIR}/${MACHINE_ARCH}
 CLEANFILES+=tags
Index: lib/libcam/Makefile
===========================================================================
--- lib/libcam/Makefile	2003/08/11 22:55:52	#2
+++ lib/libcam/Makefile	2003/08/11 22:55:52
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/libcam/Makefile,v 1.10 2003/06/14 05:28:00 ken Exp $
 
 LIB=		cam
+SHLIBDIR?=	/lib
 SRCS=		camlib.c scsi_cmdparse.c scsi_all.c scsi_da.c scsi_sa.c cam.c
 INCS=		camlib.h
 
Index: lib/libcrypt/Makefile
===========================================================================
--- lib/libcrypt/Makefile	2003/08/11 22:55:52	#3
+++ lib/libcrypt/Makefile	2003/08/11 22:55:52
@@ -4,6 +4,7 @@
 
 SHLIB_MAJOR=	2
 LIB=		crypt
+SHLIBDIR?=	/lib
 
 .PATH:		${.CURDIR}/../libmd
 SRCS=		crypt.c misc.c \
Index: lib/libdevstat/Makefile
===========================================================================
--- lib/libdevstat/Makefile	2003/08/11 22:55:52	#6
+++ lib/libdevstat/Makefile	2003/08/11 22:55:52
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/libdevstat/Makefile,v 1.11 2003/06/14 05:28:01 ken Exp $
 
 LIB=	devstat
+SHLIBDIR?=	/lib
 # Bump DEVSTAT_USER_API_VER in devstat.h every time this is incremented.
 SHLIB_MAJOR= 4
 SRCS=	devstat.c
Index: lib/libedit/Makefile
===========================================================================
--- lib/libedit/Makefile	2003/08/11 22:55:52	#6
+++ lib/libedit/Makefile	2003/08/11 22:55:52
@@ -4,6 +4,7 @@
 
 LIB=	edit
 SHLIB_MAJOR=	4
+SHLIBDIR?=	/lib
 
 OSRCS=	chared.c common.c el.c emacs.c fcns.c help.c hist.c key.c map.c \
 	parse.c prompt.c read.c refresh.c search.c sig.c term.c tty.c vi.c
Index: lib/libexpat/Makefile
===========================================================================
--- lib/libexpat/Makefile	2003/08/11 22:55:52	#3
+++ lib/libexpat/Makefile	2003/08/11 22:55:52
@@ -3,6 +3,7 @@
 EXPAT=		${.CURDIR}/../../contrib/expat
 
 LIB=		bsdxml
+SHLIBDIR?=	/lib
 SHLIB_MAJOR=	1
 SRCS=		xmlparse.c xmlrole.c xmltok.c
 INCS=		bsdxml.h
Index: lib/libgeom/Makefile
===========================================================================
--- lib/libgeom/Makefile	2003/08/11 22:55:52	#7
+++ lib/libgeom/Makefile	2003/08/11 22:55:52
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/libgeom/Makefile,v 1.7 2003/07/24 19:53:02 markm Exp $
 
 LIB=	geom
+SHLIBDIR?=	/lib
 SRCS+=	geom_getxml.c
 SRCS+=	geom_stats.c
 SRCS+=	geom_xml2tree.c
Index: lib/libipsec/Makefile
===========================================================================
--- lib/libipsec/Makefile	2003/08/11 22:55:52	#2
+++ lib/libipsec/Makefile	2003/08/11 22:55:52
@@ -27,6 +27,7 @@
 # $FreeBSD: src/lib/libipsec/Makefile,v 1.12 2002/09/28 00:25:29 peter Exp $
 
 LIB=	ipsec
+SHLIBDIR?=	/lib
 SHLIB_MAJOR= 1
 CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-DIPSEC_DEBUG -DIPSEC
Index: lib/libipx/Makefile
===========================================================================
--- lib/libipx/Makefile	2003/08/11 22:55:52	#1
+++ lib/libipx/Makefile	2003/08/11 22:55:52
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/libipx/Makefile,v 1.5 2001/05/18 13:41:22 ru Exp $
 
 LIB=	ipx
+SHLIBDIR?=	/lib
 SRCS=	ipx_addr.c ipx_ntoa.c
 MAN=	ipx.3
 MLINKS+=ipx.3 ipx_addr.3 ipx.3 ipx_ntoa.3
Index: lib/libkvm/Makefile
===========================================================================
--- lib/libkvm/Makefile	2003/08/11 22:55:52	#1
+++ lib/libkvm/Makefile	2003/08/11 22:55:52
@@ -2,6 +2,7 @@
 # $FreeBSD: src/lib/libkvm/Makefile,v 1.12 2001/05/18 13:41:23 ru Exp $
 
 LIB=	kvm
+SHLIBDIR?=/lib
 CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
 SRCS=	kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \
 	kvm_getswapinfo.c kvm_proc.c
Index: lib/libmd/Makefile
===========================================================================
--- lib/libmd/Makefile	2003/08/11 22:55:52	#3
+++ lib/libmd/Makefile	2003/08/11 22:55:52
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/libmd/Makefile,v 1.38 2002/09/17 01:48:51 peter Exp $
 
 LIB=	md
+SHLIBDIR?=	/lib
 SRCS=	md2c.c md4c.c md5c.c md2hl.c md4hl.c md5hl.c \
 	rmd160c.c rmd160hl.c \
 	sha0c.c sha0hl.c sha1c.c sha1hl.c
Index: lib/libncurses/Makefile
===========================================================================
--- lib/libncurses/Makefile	2003/08/11 22:55:52	#19
+++ lib/libncurses/Makefile	2003/08/11 22:55:52
@@ -3,6 +3,7 @@
 NCURSES=${.CURDIR}/../../contrib/ncurses
 
 LIB=	ncurses
+SHLIBDIR?=	/lib
 SHLIB_MAJOR=5
 
 # Should be elsewhere
@@ -233,11 +234,11 @@
 SYMLINKS+=libncurses.a ${LIBDIR}/libtinfo.a
 .if !defined(NOPIC)
 # no need for major at all, it's an ld-time redirection only
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libcurses.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtermcap.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtermlib.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libmytinfo.so
-SYMLINKS+=libncurses.so ${SHLIBDIR}/libtinfo.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libcurses.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libtermcap.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libtermlib.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libmytinfo.so
+SYMLINKS+=libncurses.so ${LIBDIR}/libtinfo.so
 .endif
 .if !defined(NOPROFILE)
 SYMLINKS+=libncurses_p.a ${LIBDIR}/libcurses_p.a
Index: lib/libpam/libpam/Makefile
===========================================================================
--- lib/libpam/libpam/Makefile	2003/08/11 22:55:52	#28
+++ lib/libpam/libpam/Makefile	2003/08/11 22:55:52
Index: lib/libpam/libpam/pam_debug_log.c
===========================================================================
--- lib/libpam/libpam/pam_debug_log.c	2003/08/11 22:55:52	#9
+++ lib/libpam/libpam/pam_debug_log.c	2003/08/11 22:55:52
Index: lib/libpam/libpam/pam_std_option.c
===========================================================================
--- lib/libpam/libpam/pam_std_option.c	2003/08/11 22:55:52	#7
+++ lib/libpam/libpam/pam_std_option.c	2003/08/11 22:55:52
Index: lib/libpam/libpam/security/pam_mod_misc.h
===========================================================================
--- lib/libpam/libpam/security/pam_mod_misc.h	2003/08/11 22:55:52	#6
+++ lib/libpam/libpam/security/pam_mod_misc.h	2003/08/11 22:55:52
Index: lib/libsbuf/Makefile
===========================================================================
--- lib/libsbuf/Makefile	2003/08/11 22:55:52	#2
+++ lib/libsbuf/Makefile	2003/08/11 22:55:52
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/libsbuf/Makefile,v 1.3 2002/01/06 08:47:19 kbyanc Exp $
 
 LIB=	sbuf
+SHLIBDIR?=	/lib
 SRCS=	subr_sbuf.c 
 WARNS?= 2
 
Index: lib/libufs/Makefile
===========================================================================
--- lib/libufs/Makefile	2003/08/11 22:55:52	#8
+++ lib/libufs/Makefile	2003/08/11 22:55:52
@@ -1,6 +1,7 @@
 # $FreeBSD: src/lib/libufs/Makefile,v 1.8 2003/06/09 09:59:11 jmallett Exp $
 
 LIB=	ufs
+SHLIBDIR?=	/lib
 SRCS=	block.c cgroup.c inode.c sblock.c type.c
 INCS=	libufs.h
 MAN=	bread.3 cgread.3 libufs.3 sbread.3 ufs_disk_close.3
Index: lib/libutil/Makefile
===========================================================================
--- lib/libutil/Makefile	2003/08/11 22:55:52	#8
+++ lib/libutil/Makefile	2003/08/11 22:55:52
@@ -3,6 +3,7 @@
 
 LIB=	util
 SHLIB_MAJOR= 3
+SHLIBDIR?=/lib
 CFLAGS+=-Wall -DLIBC_SCCS -I${.CURDIR} -I${.CURDIR}/../libc/gen/
 CFLAGS+=-DINET6
 SRCS=	_secure_path.c auth.c fparseln.c login.c login_auth.c \
Index: lib/libz/Makefile
===========================================================================
--- lib/libz/Makefile	2003/08/11 22:55:52	#2
+++ lib/libz/Makefile	2003/08/11 22:55:52
@@ -5,6 +5,7 @@
 MAINTAINER=peter@FreeBSD.org
 
 LIB=		z
+SHLIBDIR?=	/lib
 MAN=		zlib.3
 
 #CFLAGS+=	-DMAX_WBITS=14 -DMAX_MEM_LEVEL=7
Index: lib/msun/Makefile
===========================================================================
--- lib/msun/Makefile	2003/08/11 22:55:52	#9
+++ lib/msun/Makefile	2003/08/11 22:55:52
@@ -66,6 +66,7 @@
 CFLAGS+= -D_IEEE_LIBM
 
 LIB=	m
+SHLIBDIR?= /lib
 COMMON_SRCS= b_exp.c b_log.c b_tgamma.c \
 	e_acos.c e_acosf.c e_acosh.c e_acoshf.c e_asin.c e_asinf.c \
 	e_atan2.c e_atan2f.c e_atanh.c e_atanhf.c e_cosh.c e_coshf.c e_exp.c \
Index: libexec/rtld-elf/Makefile
===========================================================================
--- libexec/rtld-elf/Makefile	2003/08/11 22:55:52	#6
+++ libexec/rtld-elf/Makefile	2003/08/11 22:55:52
@@ -9,6 +9,8 @@
 CFLAGS+=	-I${.CURDIR}/${MACHINE_ARCH} -I${.CURDIR}
 LDFLAGS+=	-nostdlib -e .rtld_start
 INSTALLFLAGS=	-fschg -C -b
+BINDIR=		/libexec
+SYMLINKS=	${BINDIR}/ld-elf.so.1 /usr/libexec/ld-elf.so.1
 MLINKS=		rtld.1 ld-elf.so.1.1 \
 		rtld.1 ld.so.1
 
Index: libexec/rtld-elf/rtld.c
===========================================================================
--- libexec/rtld-elf/rtld.c	2003/08/11 22:55:52	#33
+++ libexec/rtld-elf/rtld.c	2003/08/11 22:55:52
@@ -57,7 +57,7 @@
 #endif
 
 #define END_SYM		"_end"
-#define PATH_RTLD	"/usr/libexec/ld-elf.so.1"
+#define PATH_RTLD	"/libexec/ld-elf.so.1"
 
 /* Types. */
 typedef void (*func_ptr_type)();
@@ -807,7 +807,7 @@
  *   rpath in the referencing file
  *   LD_LIBRARY_PATH
  *   ldconfig hints
- *   /usr/lib
+ *   /lib:/usr/lib
  */
 static char *
 find_library(const char *xname, const Obj_Entry *refobj)
Index: libexec/rtld-elf/rtld.h
===========================================================================
--- libexec/rtld-elf/rtld.h	2003/08/11 22:55:52	#9
+++ libexec/rtld-elf/rtld.h	2003/08/11 22:55:52
@@ -40,7 +40,7 @@
 #include "rtld_machdep.h"
 
 #ifndef STANDARD_LIBRARY_PATH
-#define STANDARD_LIBRARY_PATH	"/usr/lib"
+#define STANDARD_LIBRARY_PATH	"/lib:/usr/lib"
 #endif
 
 #define NEW(type)	((type *) xmalloc(sizeof(type)))
Index: sbin/Makefile.inc
===========================================================================
--- sbin/Makefile.inc	2003/08/11 22:55:52	#2
+++ sbin/Makefile.inc	2003/08/11 22:55:52
@@ -2,5 +2,8 @@
 # $FreeBSD: src/sbin/Makefile.inc,v 1.8 2001/12/04 02:19:43 obrien Exp $
 
 BINDIR?=	/sbin
+WARNS?=	2
+
+.if !defined (WITH_DYNAMICROOT)
 NOSHARED?=	YES
-WARNS?=	2
+.endif
Index: sbin/devd/Makefile
===========================================================================
--- sbin/devd/Makefile	2003/08/11 22:55:52	#4
+++ sbin/devd/Makefile	2003/08/11 22:55:52
@@ -5,6 +5,8 @@
 MAN=	devd.8 devd.conf.5
 WARNS?=	1
 
+NOSHARED?=YES
+
 DPADD=	${LIBL}
 LDADD=	-ll
 
Index: secure/lib/libcrypto/Makefile
===========================================================================
--- secure/lib/libcrypto/Makefile	2003/08/11 22:55:52	#24
+++ secure/lib/libcrypto/Makefile	2003/08/11 22:55:52
@@ -1,6 +1,7 @@
 # $FreeBSD: src/secure/lib/libcrypto/Makefile,v 1.64 2003/06/01 23:39:16 obrien Exp $
 
 LIB=		crypto
+SHLIBDIR?=	/lib
 SHLIB_MAJOR=	3
 
 NOLINT=		true
Index: share/mk/bsd.lib.mk
===========================================================================
--- share/mk/bsd.lib.mk	2003/08/11 22:55:52	#50
+++ share/mk/bsd.lib.mk	2003/08/11 22:55:52
@@ -206,7 +206,12 @@
 	    ${_INSTALLFLAGS} ${_SHLINSTALLFLAGS} \
 	    ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}
 .if defined(SHLIB_LINK)
-	ln -fs ${SHLIB_NAME} ${DESTDIR}${SHLIBDIR}/${SHLIB_LINK}
+.if (${LIBDIR} == ${SHLIBDIR})
+	ln -fs ${SHLIB_NAME} ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+.else
+	ln -fs ${LIBDIR:C|/[^/]+|/..|g:S|^/||}${SHLIBDIR}/${SHLIB_NAME} \
+	    ${DESTDIR}${LIBDIR}/${SHLIB_LINK}
+.endif
 .endif
 .endif
 .if defined(INSTALL_PIC_ARCHIVE) && defined(LIB) && !empty(LIB)
Index: sys/alpha/alpha/elf_machdep.c
===========================================================================
--- sys/alpha/alpha/elf_machdep.c	2003/08/11 22:55:52	#8
+++ sys/alpha/alpha/elf_machdep.c	2003/08/11 22:55:52
@@ -81,7 +81,7 @@
 						EM_ALPHA,
 						"FreeBSD",
 						"",
-						"/usr/libexec/ld-elf.so.1",
+						"/libexec/ld-elf.so.1",
 						&elf64_freebsd_sysvec
 					  };
 
Index: sys/amd64/amd64/elf_machdep.c
===========================================================================
--- sys/amd64/amd64/elf_machdep.c	2003/08/11 22:55:52	#4
+++ sys/amd64/amd64/elf_machdep.c	2003/08/11 22:55:52
@@ -78,7 +78,7 @@
 						EM_X86_64,
 						"FreeBSD",
 						"",
-						"/usr/libexec/ld-elf.so.1",
+						"/libexec/ld-elf.so.1",
 						&elf64_freebsd_sysvec
 					  };
 
Index: sys/i386/i386/elf_machdep.c
===========================================================================
--- sys/i386/i386/elf_machdep.c	2003/08/11 22:55:52	#7
+++ sys/i386/i386/elf_machdep.c	2003/08/11 22:55:52
@@ -79,7 +79,7 @@
 						EM_386,
 						"FreeBSD",
 						"",
-						"/usr/libexec/ld-elf.so.1",
+						"/libexec/ld-elf.so.1",
 						&elf32_freebsd_sysvec
 					  };
 
Index: sys/ia64/ia32/ia32_sysvec.c
===========================================================================
--- sys/ia64/ia32/ia32_sysvec.c	2003/08/11 22:55:52	#3
+++ sys/ia64/ia32/ia32_sysvec.c	2003/08/11 22:55:52
@@ -123,7 +123,7 @@
 						EM_386,
 						"FreeBSD",
 						"/compat/ia32",
-						"/usr/libexec/ld-elf.so.1",
+						"/lib/ld-elf.so.1",
 						&ia32_freebsd_sysvec
 					  };
 
Index: sys/ia64/ia64/elf_machdep.c
===========================================================================
--- sys/ia64/ia64/elf_machdep.c	2003/08/11 22:55:52	#11
+++ sys/ia64/ia64/elf_machdep.c	2003/08/11 22:55:52
@@ -81,7 +81,7 @@
 						EM_IA_64,
 						"FreeBSD",
 						"",
-						"/usr/libexec/ld-elf.so.1",
+						"/libexec/ld-elf.so.1",
 						&elf64_freebsd_sysvec
 					  };
 
Index: sys/powerpc/powerpc/elf_machdep.c
===========================================================================
--- sys/powerpc/powerpc/elf_machdep.c	2003/08/11 22:55:52	#6
+++ sys/powerpc/powerpc/elf_machdep.c	2003/08/11 22:55:52
@@ -80,7 +80,7 @@
 						EM_PPC,
 						"FreeBSD",
 						"",
-						"/usr/libexec/ld-elf.so.1",
+						"/libexec/ld-elf.so.1",
 						&elf32_freebsd_sysvec
 					  };
 
Index: sys/sparc64/sparc64/elf_machdep.c
===========================================================================
--- sys/sparc64/sparc64/elf_machdep.c	2003/08/11 22:55:52	#12
+++ sys/sparc64/sparc64/elf_machdep.c	2003/08/11 22:55:52
@@ -91,7 +91,7 @@
 						EM_SPARCV9,
 						"FreeBSD",
 						"",
-						"/usr/libexec/ld-elf.so.1",
+						"/libexec/ld-elf.so.1",
 						&elf64_freebsd_sysvec
 					  };