From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Sat, 25 Nov 2017 23:15:23 +0000 (-0500)
Subject: Update MSVC build process for new timezone data.
X-Git-Tag: REL9_3_21~34
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a2826ff8b167f7f23ee60ee11f04ec9a5d2aac82;p=thirdparty%2Fpostgresql.git

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 04d4dbc59e2..a7f3ab2fb57 100644
--- a/src/tools/msvc/Install.pm
+++ b/src/tools/msvc/Install.pm
@@ -316,8 +316,8 @@ sub GenerateTimezoneFiles
 	my $mf     = read_file("src/timezone/Makefile");
 	$mf =~ s{\\\s*[\r\n]+}{}mg;
 
-	$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
@@ -332,7 +332,8 @@ sub GenerateTimezoneFiles
 	foreach (@tzfiles)
 	{
 		my $tzfile = $_;
-		push(@args, "src/timezone/data/$tzfile")
+		$tzfile =~ s|\$\(srcdir\)|src/timezone|;
+		push(@args, $tzfile);
 	}
 
 	system(@args);