diff options
| author | Eric Andersen <andersen@codepoet.org> | 2001-08-13 22:20:28 +0000 |
|---|---|---|
| committer | Eric Andersen <andersen@codepoet.org> | 2001-08-13 22:20:28 +0000 |
| commit | 3c735763c230948708f6ab465aed53328f9308fd (patch) | |
| tree | 840d37957fbc5dd7fd5b0b77c10c93302dd6de82 | |
| parent | c784f7652f07e0488d373ad0b1bfd26cf95a8178 (diff) | |
| download | uClibc-alpine-3c735763c230948708f6ab465aed53328f9308fd.tar.bz2 uClibc-alpine-3c735763c230948708f6ab465aed53328f9308fd.tar.xz | |
A few more (final?) cleanups for the installer behavior. I now think
things are working perfectly (perhaps I shouln't think so much)
| -rw-r--r-- | Makefile | 10 | ||||
| -rw-r--r-- | Rules.mak | 1 | ||||
| -rw-r--r-- | extra/gcc-uClibc/Makefile | 6 |
3 files changed, 10 insertions, 7 deletions
@@ -204,8 +204,9 @@ ifeq ($(strip $(HAVE_SHARED)),true) ln -fs $(DEVEL_PREFIX)/bin/readelf $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-readelf if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so ] ; then \ install -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so $(PREFIX)$(DEVEL_PREFIX)/lib; \ - ln -s $(PREFIX)$(DEVEL_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so \ - $(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO) || true; \ + mkdir -p $(PREFIX)$(SHARED_LIB_LOADER_PATH); \ + ln -s $(DEVEL_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so \ + $(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO) || true; \ fi; if [ -x ldso/util/ldconfig ] ; then \ install -d $(PREFIX)$(DEVEL_PREFIX)/etc; \ @@ -233,8 +234,9 @@ ifeq ($(strip $(HAVE_SHARED)),true) install -m 755 ldso/util/readelf $(PREFIX)/usr/bin if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so ] ; then \ install -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so $(PREFIX)/lib; \ - ln -s $(PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so \ - $(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO) || true; \ + mkdir -p $(PREFIX)$(SHARED_LIB_LOADER_PATH); \ + ln -s $(TARGET_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so \ + $(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO) || true; \ fi; if [ -x ldso/util/ldconfig ] ; then \ install -d $(PREFIX)/etc; \ @@ -26,6 +26,7 @@ include $(TOPDIR)Config MAJOR_VERSION=0 MINOR_VERSION=9.5 +VERSION=$(MAJOR_VERSION).$(MINOR_VERSION) LIBNAME=libc.a SHARED_FULLNAME=libuClibc-$(MAJOR_VERSION).$(MINOR_VERSION).so diff --git a/extra/gcc-uClibc/Makefile b/extra/gcc-uClibc/Makefile index 8fe33fe9e..b27d440fb 100644 --- a/extra/gcc-uClibc/Makefile +++ b/extra/gcc-uClibc/Makefile @@ -37,9 +37,9 @@ install: all install -m 755 $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ install -m 755 $(TARGET_ARCH)-uclibc-ld $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/ ln -fs $(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-cc - ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc - ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc - ln -fs $(PREFIX)$(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)/bin/ld + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/gcc + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-gcc $(PREFIX)$(DEVEL_PREFIX)/bin/cc + ln -fs $(SYSTEM_DEVEL_PREFIX)/bin/$(TARGET_ARCH)-uclibc-ld $(PREFIX)$(DEVEL_PREFIX)/bin/ld for app in addr2line ar as cpp gasp nm objcopy \ objdump ranlib size strings strip; do \ ln -fs `which $(CROSS)$${app}` $(PREFIX)$(DEVEL_PREFIX)/bin/$${app}; \ |