Commit 26351d1c authored by Magnus Hagander's avatar Magnus Hagander

Fix msvc install script to properly install NLS files when built with

gettext.
parent fa0dc92f
...@@ -3,7 +3,7 @@ package Install; ...@@ -3,7 +3,7 @@ package Install;
# #
# Package that provides 'make install' functionality for msvc builds # Package that provides 'make install' functionality for msvc builds
# #
# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.26 2007/12/03 15:42:58 mha Exp $ # $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.27 2008/02/07 13:49:00 mha Exp $
# #
use strict; use strict;
use warnings; use warnings;
...@@ -458,25 +458,25 @@ sub GenerateNLSFiles ...@@ -458,25 +458,25 @@ sub GenerateNLSFiles
my @flist; my @flist;
File::Find::find({wanted => File::Find::find({wanted =>
sub { /^nls\.mk\z/s && sub { /^nls\.mk\z/s &&
! push(@flist, $File::Find::name); !push(@flist, $File::Find::name);
} }
}, "src"); }, "src");
foreach (@flist) foreach (@flist)
{ {
s/nls.mk/po/; s/nls.mk/po/;
my $dir = $_; my $dir = $_;
next unless ($dir =~ /([^\\]+)\\po$/); next unless ($dir =~ /([^\/]+)\/po$/);
my $prgm = $1; my $prgm = $1;
$prgm = 'postgres' if ($prgm eq 'backend'); $prgm = 'postgres' if ($prgm eq 'backend');
foreach (glob("$dir/*.po")) foreach (glob("$dir/*.po"))
{ {
my $lang; my $lang;
next unless /^(.*)\.po/; next unless /([^\/]+)\.po/;
$lang = $1; $lang = $1;
EnsureDirectories($target, "share/locale/$lang", "share/locale/$lang/LC_MESSAGES"); EnsureDirectories($target, "share/locale/$lang", "share/locale/$lang/LC_MESSAGES");
system( system(
"$nlspath\\bin\\msgfmt -o $target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm.mo $dir\\$_" "$nlspath\\bin\\msgfmt -o $target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm.mo $_"
) )
&& croak("Could not run msgfmt on $dir\\$_"); && croak("Could not run msgfmt on $dir\\$_");
print "."; print ".";
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment