From 336eda9bf6156b628307c1d03278d4341fd3d095 Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Sat, 18 Oct 2003 11:52:09 +0000
Subject: Add a new RUNTIME_PREFIX

---
 Makefile                | 20 +++++---------------
 extra/Configs/Config.in | 15 ++++++++++++++-
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/Makefile b/Makefile
index 51327deaa..e7e9468cf 100644
--- a/Makefile
+++ b/Makefile
@@ -264,21 +264,16 @@ endif
 # system, use the "install_target" target instead... 
 install_runtime:
 ifeq ($(strip $(HAVE_SHARED)),y)
-	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)/lib
-	$(INSTALL) -d $(PREFIX)$(DEVEL_PREFIX)/bin
+	$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)/lib
+	$(INSTALL) -d $(PREFIX)$(RUNTIME_PREFIX)/bin
 	$(INSTALL) -m 644 lib/lib*-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-		$(PREFIX)$(DEVEL_PREFIX)/lib
-	cp -fa lib/*.so.* $(PREFIX)$(DEVEL_PREFIX)/lib
+		$(PREFIX)$(RUNTIME_PREFIX)/lib
+	cp -fa lib/*.so.* $(PREFIX)$(RUNTIME_PREFIX)/lib
 	@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
 	    set -x -e; \
 	    $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-	    		$(PREFIX)$(DEVEL_PREFIX)/lib; \
+	    		$(PREFIX)$(RUNTIME_PREFIX)/lib; \
 	fi;
-	#@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
-	#    $(INSTALL) -d $(PREFIX)$(SHARED_LIB_LOADER_PATH); \
-	#    $(LN) -sf $(PREFIX)$(DEVEL_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-	#		$(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO); \
-	#fi;
 endif
 
 install_toolchain:
@@ -334,11 +329,6 @@ ifeq ($(strip $(HAVE_SHARED)),y)
 	    $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	    		$(PREFIX)$(TARGET_PREFIX)/lib; \
 	fi;
-	#@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
-	#    $(INSTALL) -d $(PREFIX)$(SHARED_LIB_LOADER_PATH); \
-	#    $(LN) -sf $(PREFIX)$(TARGET_PREFIX)/lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-	#    		$(PREFIX)$(SHARED_LIB_LOADER_PATH)/$(UCLIBC_LDSO); \
-	#fi;
 endif
 
 install_target_utils:
diff --git a/extra/Configs/Config.in b/extra/Configs/Config.in
index 2f2276fd8..a275e3594 100644
--- a/extra/Configs/Config.in
+++ b/extra/Configs/Config.in
@@ -863,6 +863,19 @@ config SYSTEM_LDSO
 	  sitting in the directory this points to, your binaries will not 
 	  run.
 
+config RUNTIME_PREFIX
+	string "uClibc runtime library directory"
+	default "/usr/$(TARGET_ARCH)-linux-uclibc"
+	help
+	  RUNTIME_PREFIX is the directory into which the uClibc runtime
+	  libraries will be installed.   The result will look something
+	  like the following:
+	      $(RUNTIME_PREFIX)/
+	          lib/            <contains all runtime libraries>
+	  This value is used by the 'make install' Makefile target.  Since this
+	  directory is compiled into the uclibc cross compiler wrapper, you
+	  have to recompile uClibc if you change this value...
+
 config DEVEL_PREFIX
 	string "uClibc development environment directory"
 	default "/usr/$(TARGET_ARCH)-linux-uclibc"
@@ -871,7 +884,7 @@ config DEVEL_PREFIX
 	  environment will be installed.   The result will look something
 	  like the following:
 	      $(DEVEL_PREFIX)/
-	          lib/            <contains all runtime and static libs>
+	          lib/            <contains static libs>
 		  include/        <Where all the header files go>
 	  This value is used by the 'make install' Makefile target.  Since this
 	  directory is compiled into the uclibc cross compiler wrapper, you
-- 
cgit v1.2.3