From df7c0368c1d16c7c7fde41d2bb6ecfcd69b16a73 Mon Sep 17 00:00:00 2001
From: Gordon Tetlow <gordon@FreeBSD.org>
Date: Sun, 17 Aug 2003 08:06:00 +0000
Subject: [PATCH] As long threatened, stage 2 of making a dynamically-linked
 root a reality. Install rtld into /libexec.

---
 libexec/rtld-elf/Makefile | 2 ++
 libexec/rtld-elf/rtld.c   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index aff795f9743..7a16426b161 100644
--- a/libexec/rtld-elf/Makefile
+++ b/libexec/rtld-elf/Makefile
@@ -9,6 +9,8 @@ CFLAGS+=	-Wall -DFREEBSD_ELF -DIN_RTLD
 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
 
diff --git a/libexec/rtld-elf/rtld.c b/libexec/rtld-elf/rtld.c
index 5fc03b07b02..e8cbf24cfff 100644
--- a/libexec/rtld-elf/rtld.c
+++ b/libexec/rtld-elf/rtld.c
@@ -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)();