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

Commit daf5b0f

Browse files
committed
Fix a few places where we needed -I. in CPPFLAGS to work properly in
VPATH builds. We had this already in several places, but not all.
1 parent 9d781b5 commit daf5b0f

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

src/backend/bootstrap/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
#
33
# Makefile for the bootstrap module
44
#
5-
# $PostgreSQL: pgsql/src/backend/bootstrap/Makefile,v 1.38 2009/08/28 20:26:18 petere Exp $
5+
# $PostgreSQL: pgsql/src/backend/bootstrap/Makefile,v 1.39 2010/01/05 03:56:52 tgl Exp $
66
#
77
#-------------------------------------------------------------------------
88

99
subdir = src/backend/bootstrap
1010
top_builddir = ../../..
1111
include $(top_builddir)/src/Makefile.global
1212

13-
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
13+
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
1414

1515
OBJS= bootparse.o bootstrap.o
1616

src/backend/parser/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
#
33
# Makefile for parser
44
#
5-
# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.52 2009/10/31 01:41:31 tgl Exp $
5+
# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.53 2010/01/05 03:56:52 tgl Exp $
66
#
77
#-------------------------------------------------------------------------
88

99
subdir = src/backend/parser
1010
top_builddir = ../../..
1111
include $(top_builddir)/src/Makefile.global
1212

13-
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
13+
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
1414

1515
OBJS= analyze.o gram.o keywords.o kwlookup.o parser.o \
1616
parse_agg.o parse_clause.o parse_coerce.o parse_cte.o parse_expr.o \

src/makefiles/pgxs.mk

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# PGXS: PostgreSQL extensions makefile
22

3-
# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.18 2010/01/04 16:34:11 tgl Exp $
3+
# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.19 2010/01/05 03:56:52 tgl Exp $
44

55
# This file contains generic rules to build many kinds of simple
66
# extension modules. You only need to set a few variables and include
@@ -64,7 +64,7 @@ VPATH =
6464
endif
6565

6666

67-
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
67+
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
6868

6969
ifdef MODULES
7070
override CFLAGS += $(CFLAGS_SL)

0 commit comments

Comments
 (0)