From: <fi...@sy...> - 2011-04-09 04:21:05
|
Author: finley Date: 2011-04-08 23:20:59 -0500 (Fri, 08 Apr 2011) New Revision: 4545 Modified: trunk/initrd_source/mklibs.bef Log: Clean up a bit; better dir creation method; better handling of target pathnames Modified: trunk/initrd_source/mklibs.bef =================================================================== --- trunk/initrd_source/mklibs.bef 2011-04-09 04:19:35 UTC (rev 4544) +++ trunk/initrd_source/mklibs.bef 2011-04-09 04:20:59 UTC (rev 4545) @@ -66,8 +66,7 @@ } my %finders; -make_path("$d"); -foreach $b (@binaries) { +foreach my $b (@binaries) { print "> $b\n" if(defined $v); my $cmd = "ldd $b"; open(INPUT,"$cmd|") or die; @@ -97,15 +96,20 @@ print "> Copy libs to their destination:\n" if(defined $v); foreach my $target_lib (sort keys %keepers) { + my $source_lib = $keepers{$target_lib}; - my $target_dir = "$d" . (dirname $target_lib); + # Strip off the leading '/lib/' from the target lib name + $target_lib =~ s|^/lib/||; + + my $dest_dir = "$d/" . (dirname $target_lib); + # Remove duplicate slashes for prettiness. -BEF- - $target_dir =~ s|/+|/|g; - make_path("$target_dir"); + $dest_dir =~ s|/+|/|g; + make_path("$dest_dir"); - print "> copy $source_lib $target_dir\n" if(defined $v); - copy("$source_lib","$target_dir") or die "Copy failed: $!"; + print "> copy $source_lib $dest_dir\n" if(defined $v); + copy("$source_lib","$dest_dir") or die "Copy failed: $!"; } print ">\n" if(defined $v); |