Fix a few places where we needed -I. in CPPFLAGS to work properly in

tglsfdc · tglsfdc · commit daf5b0f2977d · 2010-01-05T03:56:52.000Z
VPATH builds.  We had this already in several places, but not all.
diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
@@ -2,15 +2,15 @@
 #
 # 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 $
 #
 #-------------------------------------------------------------------------
 
 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
@@ -2,15 +2,15 @@
 #
 # 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 $
 #
 #-------------------------------------------------------------------------
 
 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
@@ -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)

Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,15 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for the bootstrap module`
`4`	`4`	`#`
`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 $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`9`	`9`	`subdir = src/backend/bootstrap`
`10`	`10`	`top_builddir = ../../..`
`11`	`11`	`include $(top_builddir)/src/Makefile.global`
`12`	`12`
`13`		`-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)`
	`13`	`+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)`
`14`	`14`
`15`	`15`	`OBJS= bootparse.o bootstrap.o`
`16`	`16`
Original file line number	Diff line number	Diff line change
`@@ -2,15 +2,15 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for parser`
`4`	`4`	`#`
`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 $`
`6`	`6`	`#`
`7`	`7`	`#-------------------------------------------------------------------------`
`8`	`8`
`9`	`9`	`subdir = src/backend/parser`
`10`	`10`	`top_builddir = ../../..`
`11`	`11`	`include $(top_builddir)/src/Makefile.global`
`12`	`12`
`13`		`-override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)`
	`13`	`+override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)`
`14`	`14`
`15`	`15`	`OBJS= analyze.o gram.o keywords.o kwlookup.o parser.o \`
`16`	`16`	`parse_agg.o parse_clause.o parse_coerce.o parse_cte.o parse_expr.o \`