Use cross-binutils helpers when cross-compiling

[debhelper.git] / dh_installman

diff --git a/dh_installman b/dh_installman
index 602d61b342d9a545ffeaf2f154d46d491a18df0c..703b70bc3c8a93531eb6e522657f579cc7483723 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -167,7 +167,7 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        $destdir="$tmp/usr/share/man/$langcode/man$realsection/";
                }
                $destdir=~tr:/:/:s; # just for looks
-               my $instpage="$destdir/$instname.$section";
+               my $instpage="$destdir$instname.$section";
 
                next if -l $instpage;
                next if compat(5) && -e $instpage;
@@ -241,12 +241,17 @@ sub find_so_man {
                    dirname($solink)) {
                        $solink=basename($solink);
                }
-               else {
+               # A so link with a path is relative to the base of the man
+               # page hierarchy, but without a path, is relative to the
+               # current section.
+               elsif ($solink =~ m!/!) {
                        $solink="../$solink";
                }
        
-               push @sofiles,"$File::Find::dir/$_";
-               push @sodests,$solink;
+               if (-e $solink || -e "$solink.gz") {
+                       push @sofiles,"$File::Find::dir/$_";
+                       push @sodests,$solink;
+               }
        }
 }