From: Neil Conway <neilc@samurai.com>
Date: Tue, 21 Nov 2006 17:54:26 +0000 (+0000)
Subject: VC build patch from Magnus:
X-Git-Tag: REL8_2_RC1~49
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=66eda1c7b3abc17c7a53730614761628e89dcdd3;p=thirdparty%2Fpostgresql.git

VC build patch from Magnus:

Typo in the changes to plperl - uses wrong dir, and had a missing slash.

Also fixes error checking for xsubpp - it was broken in a way that hid
the problem above when run more than once (which is the normal case when
developing).
---

diff --git a/src/tools/msvc/mkvcbuild.pl b/src/tools/msvc/mkvcbuild.pl
index ec3e326ac52..421629db525 100644
--- a/src/tools/msvc/mkvcbuild.pl
+++ b/src/tools/msvc/mkvcbuild.pl
@@ -52,8 +52,11 @@ if ($solution->{options}->{perl}) {
 	$plperl->AddDefine('PLPERL_HAVE_UID_GID');
 	if (Solution::IsNewer('src\pl\plperl\SPI.c','src\pl\plperl\SPI.xs')) {
 		print 'Building src\pl\plperl\SPI.c...' . "\n";
-		system($solution->{options}->{perl} . '/bin/perl ' . $solution->{options}->{perl} . '/lib/COREExtUtils/xsubpp -typemap ' . $solution->{options}->{perl} . '/lib/CORE/ExtUtils/typemap src\pl\plperl\SPI.xs >src\pl\plperl\SPI.c');
-		die 'Failed to create SPI.c' . "\n" if ((!(-f 'src\pl\plperl\SPI.c')) || -z 'src\pl\plperl\SPI.c');
+		system($solution->{options}->{perl} . '/bin/perl ' . $solution->{options}->{perl} . '/lib/ExtUtils/xsubpp -typemap ' . $solution->{options}->{perl} . '/lib/ExtUtils/typemap src\pl\plperl\SPI.xs >src\pl\plperl\SPI.c');
+		if ((!(-f 'src\pl\plperl\SPI.c')) || -z 'src\pl\plperl\SPI.c') {
+			unlink('src\pl\plperl\SPI.c'); # if zero size
+			die 'Failed to create SPI.c' . "\n";
+		}
 	}
 	$plperl->AddReference($postgres);
 	$plperl->AddLibrary($solution->{options}->{perl} . '\lib\CORE\perl58.lib');