[projects/geninitrd] x32 install fix

[glen]

commit 1be24d6eaccdcb2ade48810fb559f80808ef496f
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Wed Feb 25 23:56:22 2015 +0200

    x32 install fix
    
    install stuff to original path, don't try to move all to /lib*

 geninitrd | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index 9e76f5c..9c00a16 100755
--- a/geninitrd
+++ b/geninitrd
@@ -543,9 +543,10 @@ inst_exec() {
 
 		libs=$(ldd "$obj" | awk '/statically|linux-(gate|vdso)\.so/{next} NF == 2 {print $1} /=/{print $3}' | sort -u)
 		for lib in $libs; do
-			if [ ! -f "$DESTDIR/$_lib/${lib##*/}" ]; then
-				inst_d /$_lib
-				inst_exec $lib /$_lib
+			libdir=$(cd $(dirname "$lib"); pwd)
+			if [ ! -f "$DESTDIR/$lib" ]; then
+				inst_d $libdir
+				inst_exec $lib $libdir
 			fi
 		done
 	done
@@ -553,9 +554,9 @@ inst_exec() {
 	# hack for uclibc linked binaries requiring this fixed path
 	# XXX: shouldn't rpath be used here instead so th
 	if [ -f $DESTDIR/$_lib/libc.so.0 ]; then
-		local lib=$DESTDIR/$_lib/libc.so.0
+		lib=$DESTDIR/$_lib/libc.so.0
 		lib=$(ldd "$lib" | awk '/statically|linux-(gate|vdso)\.so/{next} NF == 2 {print $1} /=/{print $3}' | sort -u)
-		local libdir=$(cd $(dirname "$lib"); pwd)
+		libdir=$(cd $(dirname "$lib"); pwd)
 		if [ ! -e $DESTDIR$libdir ]; then
 			libdir=$(dirname "$libdir")
 			inst_d $libdir
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/projects/geninitrd.git/commitdiff/c45a111ca18cffe5b6752a64e85faa509818ee71