Try to fix msvc build for recent initdb changes.

tglsfdc · tglsfdc · commit 041a8b37f568 · 2007-10-13T22:55:38.000Z
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile
@@ -5,7 +5,7 @@
 # Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
 # Portions Copyright (c) 1994, Regents of the University of California
 #
-# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.54 2007/10/13 20:18:41 tgl Exp $
+# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.55 2007/10/13 22:55:38 tgl Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -30,7 +30,7 @@ initdb: $(OBJS)
 encnames.c: % : $(top_srcdir)/src/backend/utils/mb/%
 	rm -f $@ && $(LN_S) $< .
 
-pqsignal.c: % : $(libpq_srcdir)/%
+pqsignal.c: % : $(top_srcdir)/src/interfaces/libpq/%
 	rm -f $@ && $(LN_S) $< .
 
 install: all installdirs
diff --git a/src/tools/msvc/Mkvcbuild.pm b/src/tools/msvc/Mkvcbuild.pm
@@ -3,7 +3,7 @@ package Mkvcbuild;
 #
 # Package that generates build files for msvc build
 #
-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.21 2007/10/03 13:43:24 mha Exp $
+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.22 2007/10/13 22:55:38 tgl Exp $
 #
 use Carp;
 use Win32;
@@ -176,7 +176,8 @@ sub mkvcbuild
     $pgregress_ecpg->AddReference($libpgport);
 
     # src/bin
-    my $initdb = AddSimpleFrontend('initdb', 1);
+    my $initdb = AddSimpleFrontend('initdb');
+    $initdb->AddIncludeDir('src\interfaces\libpq');
     $initdb->AddLibrary('wsock32.lib ws2_32.lib');
 
     my $pgconfig = AddSimpleFrontend('pg_config');

Original file line number	Diff line number	Diff line change
`@@ -5,7 +5,7 @@`
`5`	`5`	`# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group`
`6`	`6`	`# Portions Copyright (c) 1994, Regents of the University of California`
`7`	`7`	`#`
`8`		`-# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.54 2007/10/13 20:18:41 tgl Exp $`
	`8`	`+# $PostgreSQL: pgsql/src/bin/initdb/Makefile,v 1.55 2007/10/13 22:55:38 tgl Exp $`
`9`	`9`	`#`
`10`	`10`	`#-------------------------------------------------------------------------`
`11`	`11`
`@@ -30,7 +30,7 @@ initdb: $(OBJS)`
`30`	`30`	`encnames.c: % : $(top_srcdir)/src/backend/utils/mb/%`
`31`	`31`	`rm -f $@ && $(LN_S) $< .`
`32`	`32`
`33`		`-pqsignal.c: % : $(libpq_srcdir)/%`
	`33`	`+pqsignal.c: % : $(top_srcdir)/src/interfaces/libpq/%`
`34`	`34`	`rm -f $@ && $(LN_S) $< .`
`35`	`35`
`36`	`36`	`install: all installdirs`
Original file line number	Diff line number	Diff line change
`@@ -3,7 +3,7 @@ package Mkvcbuild;`
`3`	`3`	`#`
`4`	`4`	`# Package that generates build files for msvc build`
`5`	`5`	`#`
`6`		`-# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.21 2007/10/03 13:43:24 mha Exp $`
	`6`	`+# $PostgreSQL: pgsql/src/tools/msvc/Mkvcbuild.pm,v 1.22 2007/10/13 22:55:38 tgl Exp $`
`7`	`7`	`#`
`8`	`8`	`use Carp;`
`9`	`9`	`use Win32;`
`@@ -176,7 +176,8 @@ sub mkvcbuild`
`176`	`176`	`$pgregress_ecpg->AddReference($libpgport);`
`177`	`177`
`178`	`178`	`# src/bin`
`179`		`- my $initdb = AddSimpleFrontend('initdb', 1);`
	`179`	`+ my $initdb = AddSimpleFrontend('initdb');`
	`180`	`+ $initdb->AddIncludeDir('src\interfaces\libpq');`
`180`	`181`	`$initdb->AddLibrary('wsock32.lib ws2_32.lib');`
`181`	`182`
`182`	`183`	`my $pgconfig = AddSimpleFrontend('pg_config');`