postgres.git / summary / log / commit / refs

commit    a2826ff8b167f7f23ee60ee11f04ec9a5d2aac82
Author:   Tom Lane <tgl@sss.pgh.pa.us>
Date:     Sat Nov 25 23:15:23 2017 +0000

    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 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);


[parent: d46f691581e5]