Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 26351d1

Browse files
committed
Fix msvc install script to properly install NLS files when built with
gettext.
1 parent fa0dc92 commit 26351d1

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

src/tools/msvc/Install.pm

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package Install;
33
#
44
# Package that provides 'make install' functionality for msvc builds
55
#
6-
# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.26 2007/12/03 15:42:58 mha Exp $
6+
# $PostgreSQL: pgsql/src/tools/msvc/Install.pm,v 1.27 2008/02/07 13:49:00 mha Exp $
77
#
88
use strict;
99
use warnings;
@@ -456,27 +456,27 @@ sub GenerateNLSFiles
456456
print "Installing NLS files...";
457457
EnsureDirectories($target, "share/locale");
458458
my @flist;
459-
File::Find::find({wanted =>
460-
sub { /^nls\.mk\z/s &&
461-
! push(@flist, $File::Find::name);
462-
}
459+
File::Find::find({wanted =>
460+
sub { /^nls\.mk\z/s &&
461+
!push(@flist, $File::Find::name);
462+
}
463463
}, "src");
464464
foreach (@flist)
465465
{
466466
s/nls.mk/po/;
467467
my $dir = $_;
468-
next unless ($dir =~ /([^\\]+)\\po$/);
468+
next unless ($dir =~ /([^\/]+)\/po$/);
469469
my $prgm = $1;
470470
$prgm = 'postgres' if ($prgm eq 'backend');
471471
foreach (glob("$dir/*.po"))
472472
{
473473
my $lang;
474-
next unless /^(.*)\.po/;
474+
next unless /([^\/]+)\.po/;
475475
$lang = $1;
476476

477477
EnsureDirectories($target, "share/locale/$lang", "share/locale/$lang/LC_MESSAGES");
478478
system(
479-
"$nlspath\\bin\\msgfmt -o $target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm.mo $dir\\$_"
479+
"$nlspath\\bin\\msgfmt -o $target\\share\\locale\\$lang\\LC_MESSAGES\\$prgm.mo $_"
480480
)
481481
&& croak("Could not run msgfmt on $dir\\$_");
482482
print ".";

0 commit comments

Comments
 (0)