Fix include paths for case of VPATH build.

diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index 5e91504092ca314120ea91226146e65fc0782d0a..7ece0e4606a7c01e500dc9b6ee6850dc3bf42e96 100644 (file)
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@@ -10,6 +10,8 @@ subdir = src/backend/bootstrap
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+
 # qnx4's wlink currently crashes with bootstrap.o
 ifneq ($(PORTNAME), qnx4)
 OBJS= bootparse.o bootscanner.o bootstrap.o 

diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
index 2a163483f3fdf17ef0f0bccb6e5bc3fa64e27803..1ca9af70278c7b34db731e71696e3f18d390dba0 100644 (file)
--- a/src/interfaces/ecpg/preproc/Makefile
+++ b/src/interfaces/ecpg/preproc/Makefile
@@ -8,7 +8,7 @@ MAJOR_VERSION=2
 MINOR_VERSION=9
 PATCHLEVEL=0
 
-override CPPFLAGS := -I$(srcdir)/../include $(CPPFLAGS) \
+override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) \
        -DMAJOR_VERSION=$(MAJOR_VERSION) \
        -DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
        -DINCLUDE_PATH=\"$(includedir)\"