diff options
| author | Tom Lane | 2017-11-25 23:15:23 +0000 |
|---|---|---|
| committer | Tom Lane | 2017-11-25 23:15:23 +0000 |
| commit | 1601a9413fbfb98370c3299e3c9da514a0331c6d (patch) | |
| tree | 463c5fb19d5650c1af5e9f751cf331b17cb27116 /src | |
| parent | 10aa064c953e5e7e7cccf545558a8336e5fdb220 (diff) | |
Update MSVC build process for new timezone data.
Missed this dependency in commits 7cce222c9 et al.
Diffstat (limited to 'src')
| -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 a4536d74adb..0ea3ad041bc 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -343,8 +343,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 @@ -359,7 +359,8 @@ sub GenerateTimezoneFiles foreach (@tzfiles) { my $tzfile = $_; - push(@args, "src/timezone/data/$tzfile") + $tzfile =~ s|\$\(srcdir\)|src/timezone|; + push(@args, $tzfile); } system(@args); |