From 7b0cb5eccdc9f4eb9a52b1d5c9815a7a5161a9fa Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 25 Nov 2017 18:15:22 -0500
Subject: [PATCH] Update MSVC build process for new timezone data.
Missed this dependency in commits 7cce222c9 et al.
---
src/tools/msvc/Install.pm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index 18bded431fe..d8ef98e4f7a 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);
--
GitLab