From 094bacdbd84627791b82db46b095558f34c36831 Mon Sep 17 00:00:00 2001 From: Roland McGrath Date: Wed, 8 Nov 1995 02:28:15 +0000 Subject: * elf/Makefile (ldd): Make it executable. * Makeconfig (config-LDFLAGS): Find dynamic linker in $(slibdir). * Makeconfig (slibdir): New variable. * Makerules (install): Install libc.so in $(slibdir). * elf/Makefile (install-others): Install ld.so and ld-linux.so.1 in $(slibdir). --- elf/Makefile | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'elf') diff --git a/elf/Makefile b/elf/Makefile index 314289b893..08288f89d5 100644 --- a/elf/Makefile +++ b/elf/Makefile @@ -38,12 +38,12 @@ include ../Makeconfig ifeq (yes,$(build-shared)) extra-objs = $(rtld-routines:=.so) soinit.so sofini.so generated = librtld.so -install-others = $(libdir)/$(rtld-installed-name) +install-others = $(slibdir)/$(rtld-installed-name) install-bin = ldd ifneq (,$(filter linux%,$(config-os))) extra-objs += linux-compat.so -install-lib += ld-linux.so.1 +install-others += $(slibdir)/ld-linux.so.1 endif endif @@ -73,8 +73,10 @@ $(objpfx)libdl.so: $(objpfx)libdl_pic.a $(common-objpfx)libc.so $(objpfx)ld.so $(LDFLAGS.so) $(LDFLAGS-dl.so) \ -Wl,--whole-archive $(^:$(objpfx)%=%) -$(libdir)$(rtld-installed-name): $(objpfx)ld.so; $(do-install-program) +$(slibdir)/$(rtld-installed-name): $(objpfx)ld.so; $(do-install-program) +$(slibdir)/ld-linux.so.1: $(objpfx)ld-linux.so.1; $(do-install-program) $(objpfx)ldd: ldd.sh.in sed 's%@RTLD@%$(libdir)/$(rtld-installed-name)%g' < $< > $@.new + chmod 555 $@.new mv -f $@.new $@ -- cgit v1.2.3