r1916: * dh_installman: When --language is used, be smarter about stripping

[debhelper.git] / dh_installman

diff --git a/dh_installman b/dh_installman
index e8ed27da51ca909227da2164742c9d705ac810dc..7f39b9348ef06a221edb33615d00b729b9c10f8b 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 '') {