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.
This commit is contained in:
parent
9d781b55f4
commit
daf5b0f297
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# Makefile for the bootstrap module
|
# 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 = ../../..
|
top_builddir = ../../..
|
||||||
include $(top_builddir)/src/Makefile.global
|
include $(top_builddir)/src/Makefile.global
|
||||||
|
|
||||||
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
|
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
|
||||||
|
|
||||||
OBJS= bootparse.o bootstrap.o
|
OBJS= bootparse.o bootstrap.o
|
||||||
|
|
||||||
|
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# Makefile for parser
|
# 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 = ../../..
|
top_builddir = ../../..
|
||||||
include $(top_builddir)/src/Makefile.global
|
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 \
|
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 \
|
parse_agg.o parse_clause.o parse_coerce.o parse_cte.o parse_expr.o \
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
# PGXS: PostgreSQL extensions makefile
|
# 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
|
# This file contains generic rules to build many kinds of simple
|
||||||
# extension modules. You only need to set a few variables and include
|
# extension modules. You only need to set a few variables and include
|
||||||
@ -64,7 +64,7 @@ VPATH =
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
|
|
||||||
override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
|
override CPPFLAGS := -I. -I$(srcdir) $(CPPFLAGS)
|
||||||
|
|
||||||
ifdef MODULES
|
ifdef MODULES
|
||||||
override CFLAGS += $(CFLAGS_SL)
|
override CFLAGS += $(CFLAGS_SL)
|
||||||
|
Loading…
x
Reference in New Issue
Block a user