From 443ceb1c7efdfe3ca9476c719656db0f38a7e374 Mon Sep 17 00:00:00 2001 From: Jens Schweikhardt Date: Sun, 14 Nov 2004 21:14:06 +0000 Subject: [PATCH] Revert previous commit. As ru explains: In the old world (as the surrounding comment in makefile says), there was the /usr/libexec/ld-elf.so.1 binary which is now a symlink to /libexec/ld-elf.so.1. To symlink, we need to make sure that the _target_ (and the target is /usr/libexec/ld-elf.so.1) doesn't have "schg" flag set. A real solution is to protect the chflags call only if target exists, like we do in usr.bin/tip/tip/Makefile. Requested by: ru --- libexec/rtld-elf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile index 1b2910a7717..e5235a92a20 100644 --- a/libexec/rtld-elf/Makefile +++ b/libexec/rtld-elf/Makefile @@ -48,7 +48,7 @@ dyn_hack.so: # Since moving rtld-elf to /libexec, we need to create a symlink. # Fixup the existing binary that's there so we can symlink over it. beforeinstall: - -chflags noschg ${DESTDIR}/${BINDIR}/${PROG} + -chflags noschg ${DESTDIR}/usr/libexec/${PROG} .PATH: ${.CURDIR}/${MACHINE_ARCH}