Browse Source

A few more (final?) cleanups for the installer behavior. I now think
things are working perfectly (perhaps I shouln't think so much)

Eric Andersen 24 years ago
parent
commit
3c735763c2
3 changed files with 10 additions and 7 deletions
  1. 6 4
      Makefile
  2. 1 0
      Rules.mak
  3. 3 3
      extra/gcc-uClibc/Makefile

+ 6 - 4
Makefile

@@ -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; \

+ 1 - 0
Rules.mak

@@ -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

+ 3 - 3
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}; \