summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorTom Lane <tgl@sss.pgh.pa.us>2017-11-25 18:15:23 -0500
committerTom Lane <tgl@sss.pgh.pa.us>2017-11-25 18:15:23 -0500
commitcd3bde814612ffebe11a754116a70010ae195784 (patch)
tree463c40ec76b8d6c449d3b824b9541247c07a3e18 /src
parent0a7e951810459c300ef403c6b891be20e4715388 (diff)
Update MSVC build process for new timezone data.
Missed this dependency in commits 7cce222c9 et al.
Diffstat (limited to 'src')
-rw-r--r--src/tools/msvc/Install.pm7
1 files changed, 4 insertions, 3 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index afb1b770e77..d55ec4a86fc 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -381,8 +381,8 @@ sub GenerateTimezoneFiles
my $mf = read_file("src/timezone/Makefile");
$mf =~ s{\\\r?\n}{}g;
- $mf =~ /^TZDATA\s*:?=\s*(.*)$/m
- || die "Could not find TZDATA line in timezone makefile\n";
+ $mf =~ /^TZDATAFILES\s*:?=\s*(.*)$/m
+ || die "Could not find TZDATAFILES line in timezone makefile\n";
my @tzfiles = split /\s+/, $1;
$mf =~ /^POSIXRULES\s*:?=\s*(.*)$/m
@@ -397,7 +397,8 @@ sub GenerateTimezoneFiles
foreach (@tzfiles)
{
my $tzfile = $_;
- push(@args, "src/timezone/data/$tzfile");
+ $tzfile =~ s|\$\(srcdir\)|src/timezone|;
+ push(@args, $tzfile);
}
system(@args);