Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit 041a8b3

Browse files
committed
Try to fix msvc build for recent initdb changes.
1 parent 2ffc0e8 commit 041a8b3

File tree

2 files changed

+5
-4
lines changed

2 files changed

+5
-4
lines changed

src/bin/initdb/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
# Portions Copyright (c) 1996-2007, PostgreSQL Global Development Group
66
# Portions Copyright (c) 1994, Regents of the University of California
77
#
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 $
99
#
1010
#-------------------------------------------------------------------------
1111

@@ -30,7 +30,7 @@ initdb: $(OBJS)
3030
encnames.c: % : $(top_srcdir)/src/backend/utils/mb/%
3131
rm -f $@ && $(LN_S) $< .
3232

33-
pqsignal.c: % : $(libpq_srcdir)/%
33+
pqsignal.c: % : $(top_srcdir)/src/interfaces/libpq/%
3434
rm -f $@ && $(LN_S) $< .
3535

3636
install: all installdirs

src/tools/msvc/Mkvcbuild.pm

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package Mkvcbuild;
33
#
44
# Package that generates build files for msvc build
55
#
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 $
77
#
88
use Carp;
99
use Win32;
@@ -176,7 +176,8 @@ sub mkvcbuild
176176
$pgregress_ecpg->AddReference($libpgport);
177177

178178
# src/bin
179-
my $initdb = AddSimpleFrontend('initdb', 1);
179+
my $initdb = AddSimpleFrontend('initdb');
180+
$initdb->AddIncludeDir('src\interfaces\libpq');
180181
$initdb->AddLibrary('wsock32.lib ws2_32.lib');
181182

182183
my $pgconfig = AddSimpleFrontend('pg_config');

0 commit comments

Comments
 (0)