From f01010de9b930aed92bac4f9d5236bd0a2ec6a87 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Sat, 31 Jul 1999 07:21:56 +0000
Subject: [PATCH] Update.

	* Makeconfig (link-libc): Always define it, not only for shared
	builds.
---
 ChangeLog  |  3 +++
 Makeconfig | 15 ++++++++-------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 669418d29c..52ee4dbacf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 1999-07-31  Ulrich Drepper  <drepper@cygnus.com>
 
+	* Makeconfig (link-libc): Always define it, not only for shared
+	builds.
+
 	* sysdeps/i386/fpu/e_pow.S: Use addl %esp instead of pop.
 	* sysdeps/i386/fpu/e_powf.S: Likewise.
 	* sysdeps/i386/fpu/e_powl.S: Likewise.  [PR libc/1213].
diff --git a/Makeconfig b/Makeconfig
index e1e53605ab..fb11c28691 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -407,13 +407,6 @@ ifeq (yes,$(build-shared))
 link-libc = -Wl,-rpath-link=$(rpath-link) \
 	    $(common-objpfx)libc.so$(libc.so-version) \
 	    $(common-objpfx)$(patsubst %,$(libtype.oS),c) $(gnulib)
-# Choose the default search path for the dynamic linker based on
-# where we will install libraries.
-ifneq ($(libdir),$(slibdir))
-default-rpath = $(slibdir):$(libdir)
-else
-default-rpath = $(libdir)
-endif
 # This is how to find at build-time things that will be installed there.
 rpath-dirs = math elf dlfcn nss nis db2 rt resolv
 rpath-link = \
@@ -427,6 +420,14 @@ link-libc = $(common-objpfx)libc.a $(otherlibs) $(gnulib) $(common-objpfx)libc.a
 endif
 endif
 
+# Choose the default search path for the dynamic linker based on
+# where we will install libraries.
+ifneq ($(libdir),$(slibdir))
+default-rpath = $(slibdir):$(libdir)
+else
+default-rpath = $(libdir)
+endif
+
 ifndef link-extra-libs
 ifeq (yes,$(build-shared))
 ifneq ($(common-objpfx),$(objpfx))