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.

diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index 604f0e95437deea82c6ebf7da4c06996ce718b0a..5ab023d228237959640adca5aee98879aa101ef4 100644 (file)
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@@ -10,7 +10,7 @@ subdir = src/backend/bootstrap
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
 OBJS= bootparse.o bootstrap.o 
 

diff --git a/src/backend/parser/Makefile b/src/backend/parser/Makefile
index 8e4c963dc63273e44834c722ab51024ec1438d03..a8f4c07b5a32596a73513285b088217af14dc93e 100644 (file)
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@@ -10,7 +10,7 @@ subdir = src/backend/parser
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
 OBJS= analyze.o gram.o keywords.o kwlookup.o parser.o \
       parse_agg.o parse_clause.o parse_coerce.o parse_cte.o parse_expr.o \

diff --git a/src/makefiles/pgxs.mk b/src/makefiles/pgxs.mk
index 58ad696716a57979422bf81b55d6d3f5aaa294bb..973967a7efe16562dd8db528752262d9025171fe 100644 (file)
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -64,7 +64,7 @@ VPATH =
 endif
 
 
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
 
 ifdef MODULES
 override CFLAGS += $(CFLAGS_SL)