r1980: * prerm and postrm scripts are now generated in a reverse order than

[debhelper.git] / dh_installman

diff --git a/dh_installman b/dh_installman
index 6544eae46b68b79401e53babc57fecfb17724028..6dbafb820d9baf20aa7f56bfd1b8fb3febd79486 100755 (executable)
--- a/dh_installman
+++ b/dh_installman
@@ -148,14 +148,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                        # language code to the filename, so detect that and
                        # redirect to appropriate directory, stripping the code.
                        ($langcode)=$basename=~m/.*\.([a-z][a-z](?:_[A-Z][A-Z])?)\.(?:[1-9]|man)/;
-                       if (defined $langcode && $langcode ne '') {
-                               # Strip the language code from the instname.
-                               $instname=~s/\.$langcode$//;
-                       }
                }
                elsif ($dh{LANGUAGE} ne 'C') {
                        $langcode=$dh{LANGUAGE};
-                       ($instname)=$basename=~m/(.*?)\./;
+               }
+               
+               if (defined $langcode && $langcode ne '') {
+                       # Strip the language code from the instname.
+                       $instname=~s/\.$langcode$//;
                }
                
                if (defined $langcode && $langcode ne '') {
@@ -163,14 +163,14 @@ foreach my $package (@{$dh{DOPACKAGES}}) {
                }
                $destdir=~tr:/:/:s; # just for looks
 
-               if (! -e "$destdir/$instname.$section" && 
-                   ! -l "$destdir/$instname.$section") {
-                       if (! -d $destdir) {
-                               doit "install","-d",$destdir;
-                       }
-                       doit "install","-p","-m644",$page,
-                               "$destdir$instname.$section$gz";
+               next if -l "$destdir/$instname.$section";
+               next if compat(5) && -e "$destdir/$instname.$section";
+
+               if (! -d $destdir) {
+                       doit "install","-d",$destdir;
                }
+               doit "install","-p","-m644",$page,
+                       "$destdir$instname.$section$gz";
                
        }
 
@@ -205,6 +205,11 @@ sub find_so_man {
        }
        my $l=<SOTEST>;
        close SOTEST;
+
+       if (! defined $l) {
+               error("failed to read $_");
+       }
+       
        if ($l=~m/\.so\s+(.*)\s*/) {
                my $solink=$1;
                # This test is here to prevent links like ... man8/../man8/foo.8