aboutsummaryrefslogtreecommitdiff
path: root/Makerules
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>1995-11-08 02:28:15 +0000
committerRoland McGrath <roland@gnu.org>1995-11-08 02:28:15 +0000
commit094bacdbd84627791b82db46b095558f34c36831 (patch)
tree0933db773baf1fb98ae99b26b79a1609513f369d /Makerules
parent86d2c878acad4d2f16d0af6fe6a030b90815362d (diff)
downloadglibc-094bacdbd84627791b82db46b095558f34c36831.tar
glibc-094bacdbd84627791b82db46b095558f34c36831.tar.gz
glibc-094bacdbd84627791b82db46b095558f34c36831.tar.bz2
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 'Makerules')
-rw-r--r--Makerules8
1 files changed, 5 insertions, 3 deletions
diff --git a/Makerules b/Makerules
index ac07369998..1ae1384ffa 100644
--- a/Makerules
+++ b/Makerules
@@ -475,12 +475,14 @@ endef
install-lib.so := $(filter %.so,$(install-lib:%_pic.a=%.so))
install-lib := $(filter-out %.so %_pic.a,$(install-lib))
ifeq (yes,$(build-shared))
-install: $(libdir)/libc.so$(libc.so-version)
install-lib-nosubdir: $(foreach so,$(install-lib.so),\
$(libdir)/$(patsubst $(libprefix)lib%,lib$(libprefix)%,\
$(libprefix)$(so))$($(so)-version))
-install-lib.so += libc.so
+install: $(slibdir)/libc.so$(libc.so-version)
+$(slibdir)/lib$(libprefix)c.so$(libc.so-version): $(common-objpfx)libc.so
+ $(do-install-program)
+
$(foreach v,$(sort $(foreach so,$(install-lib.so),.so$($(so)-version))),\
$(libdir)/lib$(libprefix)%$v): $(common-objpfx)lib%.so
$(do-install-program)
@@ -646,7 +648,7 @@ $(common-objpfx)stub-$(subdir): $(+depfiles)
# Make the distribution tar file.
.PHONY: dist
-dist: distinfo $(..)Make-dist
+dist: distinfo $(..)Make-dist
$(MAKE) -f $< -f $(word 2,$^) $(Make-dist-args)
# Avoid depending on source files found in sysdeps dirs,