From b7eec40bb0462b9bbcba42bcac34d098788591db Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Fri, 4 May 2001 23:00:34 +0000
Subject: Another update to make sure things work properly on x86 now.

---
 ldso/Makefile | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

(limited to 'ldso')

diff --git a/ldso/Makefile b/ldso/Makefile
index 314d22522..bfff102d2 100644
--- a/ldso/Makefile
+++ b/ldso/Makefile
@@ -5,22 +5,22 @@ SUBDIRS = util d-link libdl # man
 
 
 all:
-	@if [ -d d-link/$(TARGET_ARCH) ] ; then \
+	@if [ -d $(TOPDIR)ld.so-1/d-link/$(TARGET_ARCH) ] ; then \
 		set -e ; for d in $(SUBDIRS) ; do $(MAKE) -C $$d ; done \
 	fi;
 
 install: all
-	@if [ -d d-link/$(TARGET_ARCH) ] ; then \
-		install -d $(INSTALL_DIR)/lib
-		install -d $(INSTALL_DIR)/etc
-		install -m 755 ./d-link/$(DLINKER).$(LDSO_VMAJOR) $(INSTALL_DIR)/lib/
-		install -m 644 ./libdl/$(LIBDL).$(LDSO_VMAJOR) $(INSTALL_DIR)/lib/
-		(cd $(INSTALL_DIR)/lib/;ln -sf $(DLINKER).$(LDSO_VMAJOR) $(DLINKER))
-		(cd $(INSTALL_DIR)/lib/;ln -sf $(LIBDL).$(LDSO_VMAJOR) $(LIBDL))
+	if [ -d $(TOPDIR)ld.so-1/d-link/$(TARGET_ARCH) ] ; then \
+		install -d $(INSTALL_DIR)/lib $(INSTALL_DIR)/etc ; \
+		install -m 755 $(TOPDIR)ld.so-1/d-link/$(DLINKER).$(LDSO_VMAJOR) $(INSTALL_DIR)/lib/ ; \
+		install -m 644 $(TOPDIR)ld.so-1/libdl/$(LIBDL).$(LDSO_VMAJOR) $(INSTALL_DIR)/lib/  ; \
+		(cd $(INSTALL_DIR)/lib/;ln -sf $(DLINKER).$(LDSO_VMAJOR) $(DLINKER))  ; \
+		(cd $(INSTALL_DIR)/lib/;ln -sf $(LIBDL).$(LDSO_VMAJOR) $(LIBDL))  ; \
 	fi;
-d-link:
-	@if [ -d d-link/$(TARGET_ARCH) ] ; then \
-		do $(MAKE) -C d-link ; done \
+
+ldso:
+	@if [ -d $(TOPDIR)ld.so-1/d-link/$(TARGET_ARCH) ] ; then \
+		$(MAKE) -C d-link; \
 	fi;
 
 clean:
-- 
cgit v1.2.3