diff options
| author | Tom Lane | 2007-10-13 22:55:38 +0000 |
|---|---|---|
| committer | Tom Lane | 2007-10-13 22:55:38 +0000 |
| commit | 041a8b37f568bbb3e3a4d8609d41a7bb31e396f0 (patch) | |
| tree | df0cf9df9f8976110e7c5862a67d54244cf07d07 | |
| parent | 2ffc0e88499c38c78203038b7e1f16a7c7d4de2e (diff) | |
Try to fix msvc build for recent initdb changes.
| -rw-r--r-- | src/bin/initdb/Makefile | 4 | ||||
| -rw-r--r-- | src/tools/msvc/Mkvcbuild.pm | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/bin/initdb/Makefile b/src/bin/initdb/Makefile index afbae7e837b..6421cb0c98a 100644 --- 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 index 58c51652c83..2fce296d930 100644 --- 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'); |