From daf5b0f2977d6395daf404cfa1b60b361af86377 Mon Sep 17 00:00:00 2001
From: Tom Lane <tgl@sss.pgh.pa.us>
Date: Tue, 5 Jan 2010 03:56:52 +0000
Subject: [PATCH] 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.
---
src/backend/bootstrap/Makefile | 4 ++--
src/backend/parser/Makefile | 4 ++--
src/makefiles/pgxs.mk | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
index 53cc71285e5..f1dd7e12c3a 100644
--- a/src/backend/bootstrap/Makefile
+++ b/src/backend/bootstrap/Makefile
@@ -2,7 +2,7 @@
#
# Makefile for the bootstrap module
#
-# $PostgreSQL: pgsql/src/backend/bootstrap/Makefile,v 1.38 2009/08/28 20:26:18 petere Exp $
+# $PostgreSQL: pgsql/src/backend/bootstrap/Makefile,v 1.39 2010/01/05 03:56:52 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -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 9e58d83dfe4..7c26a70440c 100644
--- a/src/backend/parser/Makefile
+++ b/src/backend/parser/Makefile
@@ -2,7 +2,7 @@
#
# Makefile for parser
#
-# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.52 2009/10/31 01:41:31 tgl Exp $
+# $PostgreSQL: pgsql/src/backend/parser/Makefile,v 1.53 2010/01/05 03:56:52 tgl Exp $
#
#-------------------------------------------------------------------------
@@ -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 db89546b037..4f760bc8662 100644
--- a/src/makefiles/pgxs.mk
+++ b/src/makefiles/pgxs.mk
@@ -1,6 +1,6 @@
# PGXS: PostgreSQL extensions makefile
-# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.18 2010/01/04 16:34:11 tgl Exp $
+# $PostgreSQL: pgsql/src/makefiles/pgxs.mk,v 1.19 2010/01/05 03:56:52 tgl Exp $
# This file contains generic rules to build many kinds of simple
# extension modules. You only need to set a few variables and include
@@ -64,7 +64,7 @@ VPATH =
endif
-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
ifdef MODULES
override CFLAGS += $(CFLAGS_SL)
--
GitLab