summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorschweikh <schweikh@FreeBSD.org>2004-11-14 21:14:06 +0000
committerschweikh <schweikh@FreeBSD.org>2004-11-14 21:14:06 +0000
commitde23b4816030e926b8bcfb8cae771974adfd8207 (patch)
tree5bc838c243d1b57460bb4a05664083eae69a7730
parent4b4f25fcb11f7218c227b1739da241a430536d91 (diff)
downloadFreeBSD-src-de23b4816030e926b8bcfb8cae771974adfd8207.zip
FreeBSD-src-de23b4816030e926b8bcfb8cae771974adfd8207.tar.gz
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
-rw-r--r--libexec/rtld-elf/Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/libexec/rtld-elf/Makefile b/libexec/rtld-elf/Makefile
index 1b2910a..e5235a9 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}
OpenPOWER on IntegriCloud