* Makeconfig (rtld-installed-name): Set to ld.so.1.cvs/libc-960715

	* sysdeps/unix/sysv/linux/Makefile (rtld-installed-name): Variable
	removed.

	* manual/Makefile (glibc-targets): Remove subdir_ from elts.

	* sysdeps/generic/dl-sysdep.c (_dl_sysdep_read_whole_file): New fn.

4 files changed, 16 insertions, 5 deletions

diff --git a/ChangeLog b/ChangeLog
index 984bab71c3..198eb0a24f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 Sun Jul 14 01:51:39 1996  Roland McGrath  <roland@delasyd.gnu.ai.mit.edu>
 
+	* Makeconfig (rtld-installed-name): Set to ld.so.1.
+	* sysdeps/unix/sysv/linux/Makefile (rtld-installed-name): Variable
+	removed.
+
+	* manual/Makefile (glibc-targets): Remove subdir_ from elts.
+
+	* sysdeps/generic/dl-sysdep.c (_dl_sysdep_read_whole_file): New fn.
+
 	* MakeTAGS (extract): Pass --add-comments=TRANS.
 	* sysdeps/gnu/errlist.awk: Write comments into the output with the
 	descriptive paragraphs from the manual preceded by TRANS.
diff --git a/Makeconfig b/Makeconfig
index f395c18185..c06604c544 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -346,8 +346,11 @@ elf-objpfx = $(..)elf/
 endif
 
 ifeq (yes,$(build-shared))
+# The name under which the run-time dynamic linker is installed.
+# We are currently going for the convention that `/lib/ld.so.1'
+# names the SVR4/ELF ABI-compliant dynamic linker.
 ifndef rtld-installed-name
-rtld-installed-name = ld.so
+rtld-installed-name = ld.so.1
 endif
 endif
 
diff --git a/manual/Makefile b/manual/Makefile
index 6db73cdca6..54d0b06448 100644
--- a/manual/Makefile
+++ b/manual/Makefile
@@ -153,8 +153,10 @@ subdir_%: ;
 
 # These are targets that each glibc subdirectory is expected to understand.
 # ../Rules defines them for code subdirectories; for us, they are no-ops.
-glibc-targets	:= subdir_lib objects objs others tests subdir_lint.out \
-		   subdir_echo-headers subdir_echo-distinfo stubs
+# None of these should be `subdir_TARGET'; those targets are transformed
+# by the implicit rule above into `TARGET' deps.
+glibc-targets	:= lib objects objs others tests lint.out \
+		   echo-headers echo-distinfo stubs
 .PHONY: $(glibc-targets)
 $(glibc-targets):
 
diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 6eaf33852f..e8369a4f7d 100644
--- a/sysdeps/unix/sysv/linux/Makefile
+++ b/sysdeps/unix/sysv/linux/Makefile
@@ -43,7 +43,5 @@ ifeq ($(subdir), termios)
 sysdep_headers += termio.h
 endif
 
-rtld-installed-name = ld-gnu.so.1
-
 # Don't compile the ctype glue code, since there is no old non-GNU C library.
 inhibit-glue = yes