diff options
author | joeyh <joeyh> | 2006-05-11 00:08:30 +0000 |
---|---|---|
committer | joeyh <joeyh> | 2006-05-11 00:08:30 +0000 |
commit | a16d0a51903baee3969f277fd0d521ede2652010 (patch) | |
tree | 042c495b722b0fab4ee6a9b89f29ad256f2bab80 /dh_installman | |
parent | 71e1fcd2b80e45cedcf10a9ccf572fad6430fc40 (diff) | |
download | debhelper-a16d0a51903baee3969f277fd0d521ede2652010.tar.gz |
r1916: * dh_installman: When --language is used, be smarter about stripping
language codes from man page filenames. Only strip things that look like
codes that match the specified languages. Closes: #366645
Diffstat (limited to 'dh_installman')
-rwxr-xr-x | dh_installman | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/dh_installman b/dh_installman index e8ed27da..7f39b934 100755 --- 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 '') { |