summaryrefslogtreecommitdiff
path: root/Makeconfig
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 /Makeconfig
parent86d2c878acad4d2f16d0af6fe6a030b90815362d (diff)
downloadglibc-094bacdbd84627791b82db46b095558f34c36831.tar.gz
* 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 'Makeconfig')
-rw-r--r--Makeconfig9
1 files changed, 7 insertions, 2 deletions
diff --git a/Makeconfig b/Makeconfig
index 47c48d4615..e716776cb9 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -56,7 +56,7 @@ objdir = $(ARCH)
endif
endif
-# $(common-objdir) is the place to put objects and
+# $(common-objdir) is the place to put objects and
# such that are not specific to a single subdir.
ifdef objdir
objpfx = $(objdir)/
@@ -135,6 +135,11 @@ ifndef libdir
libdir = $(exec_prefix)/lib
endif
+# Where to install the shared library and dynamic linker.
+ifndef slibdir
+slibdir = $(exec_prefix)/lib
+endif
+
# Prefix to put on files installed in $(libdir). For libraries `libNAME.a',
# the prefix is spliced between `lib' and the name, so the linker switch
# `-l$(libprefix)NAME' finds the library; for other files the prefix is
@@ -281,7 +286,7 @@ ifndef +link
endif
ifndef config-LDFLAGS
ifeq (yes,$(build-shared))
-config-LDFLAGS = -Wl,-dynamic-linker=$(libdir)/$(rtld-installed-name)
+config-LDFLAGS = -Wl,-dynamic-linker=$(slibdir)/$(rtld-installed-name)
endif
endif
ifndef link-libc