From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 25 Nov 2017 23:15:22 +0000 (-0500)
Subject: Update MSVC build process for new timezone data.
X-Git-Tag: REL_11_BETA1~1164
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=6d4ae6a8e782d87ffb6aab62f75787b2722daa2d;p=postgresql

Update MSVC build process for new timezone data.

Missed this dependency in commits 7cce222c9 et al.
---

diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm
index 18bded431f..d8ef98e4f7 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);