Commitdaf5b0f

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 parent9d781b5 commitdaf5b0fCopy full SHA for daf5b0f

File tree

-6

lines changed

-6

lines changed

Lines changed: 2 additions & 2 deletions

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`		`-overrideCPPFLAGS := -I$(srcdir)$(CPPFLAGS)`
	`13`	`+overrideCPPFLAGS := -I. -I$(srcdir)$(CPPFLAGS)`
`14`	`14`
`15`	`15`	`OBJS= bootparse.o bootstrap.o`
`16`	`16`

Lines changed: 2 additions & 2 deletions

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`		`-overrideCPPFLAGS := -I$(srcdir)$(CPPFLAGS)`
	`13`	`+overrideCPPFLAGS := -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\`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`# PGXS: PostgreSQL extensions makefile`
`2`	`2`
`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 $`
`4`	`4`
`5`	`5`	`# This file contains generic rules to build many kinds of simple`
`6`	`6`	`# extension modules. You only need to set a few variables and include`
`@@ -64,7 +64,7 @@ VPATH =`
`64`	`64`	`endif`
`65`	`65`
`66`	`66`
`67`		`-overrideCPPFLAGS := -I$(srcdir)$(CPPFLAGS)`
	`67`	`+overrideCPPFLAGS := -I. -I$(srcdir)$(CPPFLAGS)`
`68`	`68`
`69`	`69`	`ifdefMODULES`
`70`	`70`	`overrideCFLAGS +=$(CFLAGS_SL)`

Comments

(0)