From 3c735763c230948708f6ab465aed53328f9308fd Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 13 Aug 2001 22:20:28 +0000
Subject: A few more (final?) cleanups for the installer behavior.  I now think
 things are working perfectly (perhaps I shouln't think so much)

---
 Makefile                  | 10 ++++++----
 Rules.mak                 |  1 +
 extra/gcc-uClibc/Makefile |  6 +++---
 3 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index 143aece36..eb3d1293c 100644
--- a/Makefile
+++ b/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; \
diff --git a/Rules.mak b/Rules.mak
index ae2c8260d..79bb4e518 100644
--- a/Rules.mak
+++ b/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
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}; \
-- 
cgit v1.2.3