[uClibc-cvs] uClibc Makefile,1.192,1.193

Erik Andersen andersen at codepoet.org
Mon Dec 2 18:44:07 UTC 2002


Update of /var/cvs/uClibc
In directory winder:/tmp/cvs-serv19897

Modified Files:
	Makefile 
Log Message:
Don't leak outside of the target area when installing things.
 -Erik


Index: Makefile
===================================================================
RCS file: /var/cvs/uClibc/Makefile,v
retrieving revision 1.192
retrieving revision 1.193
diff -u -d -r1.192 -r1.193
--- Makefile	23 Nov 2002 05:40:58 -0000	1.192
+++ Makefile	2 Dec 2002 18:44:03 -0000	1.193
@@ -197,10 +197,12 @@
 	    set -x -e; \
 	    install -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	    		$(PREFIX)$(DEVEL_PREFIX)/lib; \
-	    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) || true; \
 	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:
@@ -255,10 +257,12 @@
 	    set -x -e; \
 	    install -m 755 lib/ld-uClibc-$(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL).so \
 	    		$(PREFIX)$(TARGET_PREFIX)/lib; \
-	    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) || true; \
 	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:




More information about the uClibc-cvs mailing list