diff options
| author | Roland McGrath <roland@gnu.org> | 1995-11-08 02:28:15 +0000 |
|---|---|---|
| committer | Roland McGrath <roland@gnu.org> | 1995-11-08 02:28:15 +0000 |
| commit | 094bacdbd84627791b82db46b095558f34c36831 (patch) | |
| tree | 0933db773baf1fb98ae99b26b79a1609513f369d /elf/Makefile | |
| parent | 86d2c878acad4d2f16d0af6fe6a030b90815362d (diff) | |
| download | glibc-094bacdbd84627791b82db46b095558f34c36831.tar.gz glibc-094bacdbd84627791b82db46b095558f34c36831.tar.xz glibc-094bacdbd84627791b82db46b095558f34c36831.zip | |
* elf/Makefile (ldd): Make it executable. cvs/libc-951108
* 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).
Diffstat (limited to 'elf/Makefile')
| -rw-r--r-- | elf/Makefile | 8 |
1 files changed, 5 insertions, 3 deletions
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 $@ |