diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-11-25 18:15:23 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-11-25 18:15:23 -0500 |
| commit | a2826ff8b167f7f23ee60ee11f04ec9a5d2aac82 (patch) | |
| tree | 362d49838c2d53dd2bb139b687679607c1d49b10 | |
| parent | d46f691581e52cfe2d670a8784e814e37ee0b10d (diff) | |
Update MSVC build process for new timezone data.
Missed this dependency in commits 7cce222c9 et al.
| -rw-r--r-- | src/tools/msvc/Install.pm | 7 |
1 files 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); |