From c3bbc0eafdae7a50c46ec61f3352821b7c28ea85 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Wed, 8 Aug 2001 17:03:36 +0000
Subject: This syncs things up with my local tree.  Mainly changes installer
 issues, and syns things (as far as I am willing) with Dave Schleef's tree. 
 We may need to go another round or so, but we do seem to be converging...

---
 ldso/util/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'ldso/util/Makefile')

diff --git a/ldso/util/Makefile b/ldso/util/Makefile
index a5eb9ad6c..baa3fa897 100644
--- a/ldso/util/Makefile
+++ b/ldso/util/Makefile
@@ -8,7 +8,7 @@ readsoname.o: readsoname.c readsoname2.c
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
     
 ldconfig.o: ldconfig.c
-	$(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_PREFIX=\"$(PREFIX)\" \
+	$(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
 		-c $< -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $*.o
 
@@ -16,14 +16,20 @@ readelf: readelf.c
 	$(TARGET_CC) $(TARGET_CFLAGS) -static readelf.c -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
 
+ifeq ($(strip $(LIBRARY_CACHE)),)
+ldconfig: 
+	echo "LIBRARY_CACHE disabled -- not building ldconfig"
+else
 ldconfig: ldconfig.o readsoname.o
 	$(TARGET_CC) $(TARGET_CFLAGS) -static $^ -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
+endif
 
 ldd: ldd.c
-	$(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_PREFIX=\"$(PREFIX)\" \
+	$(TARGET_CC) $(TARGET_CFLAGS) -DUCLIBC_TARGET_PREFIX=\"$(TARGET_PREFIX)\" \
 		-DUCLIBC_DEVEL_PREFIX=\"$(DEVEL_PREFIX)\" \
 		-DUCLIBC_BUILD_DIR=\"$(shell cd $(TOPDIR); pwd)\" \
+		-DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" \
 		-static ldd.c -o $@
 	$(STRIPTOOL) -x -R .note -R .comment $@
 
-- 
cgit v1.2.3