diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2017-11-25 18:15:22 -0500 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2017-11-25 18:15:22 -0500 |
| commit | 6d4ae6a8e782d87ffb6aab62f75787b2722daa2d (patch) | |
| tree | dae6f269d7f2b731f65ce0dea8dae7dcbf2126b1 | |
| parent | 7cce222c965dec93327692dbac9c340a6220afe9 (diff) | |
| download | postgresql-6d4ae6a8e782d87ffb6aab62f75787b2722daa2d.tar.gz postgresql-6d4ae6a8e782d87ffb6aab62f75787b2722daa2d.zip | |
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 18bded431fe..d8ef98e4f7a 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); |