From 249cb00d9f655778aa8a4519ee3e610a904d694d Mon Sep 17 00:00:00 2001 From: Eric Andersen Date: Fri, 11 May 2001 21:26:43 +0000 Subject: Rework where libraries get installed to. Now thew will be compiled and dropped into a uClibc/lib dir when compiling, which will make life a bit easier when installing and cleaning up. Preface uClibc with 'lib' so ldconfig will recognize it as a library. Make all libraries have the uClibc version number attached, making upgrades possible by using the traditional symlink to the .so name plan. -Erik --- ldso/Makefile | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'ldso') diff --git a/ldso/Makefile b/ldso/Makefile index 25f9974f7..d7af33f89 100644 --- a/ldso/Makefile +++ b/ldso/Makefile @@ -8,14 +8,12 @@ all: @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 $(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/$(UCLIBC_LDSO) $(INSTALL_DIR)/lib/ld-linux-uclibc.so ; \ - install -m 644 $(TOPDIR)ld.so-1/libdl/$(LIBDL).$(MAJOR_VERSION) $(INSTALL_DIR)/lib/ ; \ - (cd $(INSTALL_DIR)/lib/;ln -sf ld-linux-uclibc.so $(UCLIBC_LDSO)); \ - (cd $(INSTALL_DIR)/lib/;ln -sf $(LIBDL).$(MAJOR_VERSION) $(LIBDL)) ; \ + @if [ -d $(TOPDIR)ld.so-1/d-link/$(TARGET_ARCH) ] ; then \ + install -d $(TOPDIR)lib ; \ + install -m 755 $(TOPDIR)ld.so-1/d-link/$(UCLIBC_LDSO) $(TOPDIR)lib/ld-linux-uclibc.so ; \ + install -m 644 $(TOPDIR)ld.so-1/libdl/$(LIBDL).$(MAJOR_VERSION) $(TOPDIR)lib ; \ + (cd $(TOPDIR)lib;ln -sf ld-linux-uclibc.so $(UCLIBC_LDSO)); \ + (cd $(TOPDIR)lib;ln -sf $(LIBDL).$(MAJOR_VERSION) $(LIBDL)) ; \ fi; ldso: -- cgit v1.2.3