Răsfoiți Sursa

Add a new RUNTIME_PREFIX

Eric Andersen 23 ani în urmă
părinte
comite
336eda9bf6
2 a modificat fișierele cu 19 adăugiri și 16 ștergeri
  1. 5 15
      Makefile
  2. 14 1
      extra/Configs/Config.in

+ 5 - 15
Makefile

@@ -264,21 +264,16 @@ endif
 # system, use the "install_target" target instead... 
 # system, use the "install_target" target instead... 
 install_runtime:
 install_runtime:
 ifeq ($(strip $(HAVE_SHARED)),y)
 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 \
 	$(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 \
 	@if [ -x lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so ] ; then \
 	    set -x -e; \
 	    set -x -e; \
 	    $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	    $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
-	    		$(PREFIX)$(DEVEL_PREFIX)/lib; \
+	    		$(PREFIX)$(RUNTIME_PREFIX)/lib; \
 	fi;
 	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
 endif
 
 
 install_toolchain:
 install_toolchain:
@@ -334,11 +329,6 @@ ifeq ($(strip $(HAVE_SHARED)),y)
 	    $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	    $(INSTALL) -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	    		$(PREFIX)$(TARGET_PREFIX)/lib; \
 	    		$(PREFIX)$(TARGET_PREFIX)/lib; \
 	fi;
 	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
 endif
 
 
 install_target_utils:
 install_target_utils:

+ 14 - 1
extra/Configs/Config.in

@@ -863,6 +863,19 @@ config SYSTEM_LDSO
 	  sitting in the directory this points to, your binaries will not 
 	  sitting in the directory this points to, your binaries will not 
 	  run.
 	  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
 config DEVEL_PREFIX
 	string "uClibc development environment directory"
 	string "uClibc development environment directory"
 	default "/usr/$(TARGET_ARCH)-linux-uclibc"
 	default "/usr/$(TARGET_ARCH)-linux-uclibc"
@@ -871,7 +884,7 @@ config DEVEL_PREFIX
 	  environment will be installed.   The result will look something
 	  environment will be installed.   The result will look something
 	  like the following:
 	  like the following:
 	      $(DEVEL_PREFIX)/
 	      $(DEVEL_PREFIX)/
-	          lib/            <contains all runtime and static libs>
+	          lib/            <contains static libs>
 		  include/        <Where all the header files go>
 		  include/        <Where all the header files go>
 	  This value is used by the 'make install' Makefile target.  Since this
 	  This value is used by the 'make install' Makefile target.  Since this
 	  directory is compiled into the uclibc cross compiler wrapper, you
 	  directory is compiled into the uclibc cross compiler wrapper, you