refactor cross command generation

[debhelper.git] / dh_makeshlibs

diff --git a/dh_makeshlibs b/dh_makeshlibs
index c52ef7d5e66dbff38632824f49fd92ee2c5d8ac9..b6779f907638673ddfa8c92512b4d64741d636bc 100755 (executable)
--- a/dh_makeshlibs
+++ b/dh_makeshlibs
@@ -93,7 +93,7 @@ Pass I<params> to L<dpkg-gensymbols(1)>.
 
 =over 4
 
-=item B<dh_makeshlibsW
+=item B<dh_makeshlibs>
 
 Assuming this is a package named F<libfoobar1>, generates a shlibs file that
 looks something like:
@@ -121,6 +121,8 @@ init(options => {
        "add-udeb=s" => \$dh{SHLIBS_UDEB},
 });
 
+my $objdump=cross_command("objdump");
+
 foreach my $package (@{$dh{DOPACKAGES}}) {
        next if is_udeb($package);
        
@@ -146,13 +148,13 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
        while (<FIND>) {
                my ($library, $major);
                push @lib_files, $_;
-               my $objdump=`objdump -p $_`;
-               if ($objdump=~m/\s+SONAME\s+(.+)\.so\.(.+)/) {
+               my $ret=`$objdump -p $_`;
+               if ($ret=~m/\s+SONAME\s+(.+)\.so\.(.+)/) {
                        # proper soname format
                        $library=$1;
                        $major=$2;
                }
-               elsif ($objdump=~m/\s+SONAME\s+(.+)-(.+)\.so/) {
+               elsif ($ret=~m/\s+SONAME\s+(.+)-(.+)\.so/) {
                        # idiotic crap soname format
                        $library=$1;
                        $major=$2;