From 0f124303c8bebc3258d2d22bdc03271e85b9ea42 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Wed, 24 Sep 2003 17:38:32 +0000
Subject: Update.

2003-09-24  Jakub Jelinek  <jakub@redhat.com>

	* nscd/Makefile (others): Add nscd before including ../Rules.
---
 nscd/Makefile | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'nscd')

diff --git a/nscd/Makefile b/nscd/Makefile
index 19875fb5e6..7392e71509 100644
--- a/nscd/Makefile
+++ b/nscd/Makefile
@@ -35,6 +35,9 @@ nscd-modules := nscd connections pwdcache getpwnam_r getpwuid_r grpcache \
 ifeq ($(have-thread-library),yes)
 
 others := nscd_nischeck
+ifneq (yesyes,$(have-fpie)$(build-shared))
+others += nscd
+endif
 install-sbin := nscd nscd_nischeck
 
 extra-objs := $(nscd-modules:=.o) nscd_nischeck.o
@@ -84,8 +87,6 @@ $(objpfx)nscd: $(addprefix $(objpfx),$(nscd-modules:=.o))
 	  $(LDFLAGS) $(LDFLAGS-$(@F)) \
 	  -L$(subst :, -L,$(rpath-link)) -Wl,-rpath-link=$(rpath-link) \
 	  -o $@ $^ $(common-objpfx)libc_nonshared.a
-else
-others += nscd
 endif
 
 # This makes sure -DNOT_IN_libc is passed for all these modules.
-- 
cgit v1.2.3-70-g09d2