Fix include paths for case of VPATH build.
This commit is contained in:
parent
c58d5d5fcb
commit
d079c419d2
@ -2,7 +2,7 @@
|
|||||||
#
|
#
|
||||||
# Makefile for the bootstrap module
|
# Makefile for the bootstrap module
|
||||||
#
|
#
|
||||||
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.29 2001/11/16 16:32:33 petere Exp $
|
# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.30 2002/01/09 00:06:42 tgl Exp $
|
||||||
#
|
#
|
||||||
#-------------------------------------------------------------------------
|
#-------------------------------------------------------------------------
|
||||||
|
|
||||||
@ -10,6 +10,8 @@ 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)
|
||||||
|
|
||||||
# qnx4's wlink currently crashes with bootstrap.o
|
# qnx4's wlink currently crashes with bootstrap.o
|
||||||
ifneq ($(PORTNAME), qnx4)
|
ifneq ($(PORTNAME), qnx4)
|
||||||
OBJS= bootparse.o bootscanner.o bootstrap.o
|
OBJS= bootparse.o bootscanner.o bootstrap.o
|
||||||
|
@ -1,4 +1,4 @@
|
|||||||
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.80 2002/01/08 20:41:28 petere Exp $
|
# $Header: /cvsroot/pgsql/src/interfaces/ecpg/preproc/Makefile,v 1.81 2002/01/09 00:06:38 tgl Exp $
|
||||||
|
|
||||||
subdir = src/interfaces/ecpg/preproc
|
subdir = src/interfaces/ecpg/preproc
|
||||||
top_builddir = ../../../..
|
top_builddir = ../../../..
|
||||||
@ -8,7 +8,7 @@ MAJOR_VERSION=2
|
|||||||
MINOR_VERSION=9
|
MINOR_VERSION=9
|
||||||
PATCHLEVEL=0
|
PATCHLEVEL=0
|
||||||
|
|
||||||
override CPPFLAGS := -I$(srcdir)/../include $(CPPFLAGS) \
|
override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) \
|
||||||
-DMAJOR_VERSION=$(MAJOR_VERSION) \
|
-DMAJOR_VERSION=$(MAJOR_VERSION) \
|
||||||
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
|
-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
|
||||||
-DINCLUDE_PATH=\"$(includedir)\"
|
-DINCLUDE_PATH=\"$(includedir)\"
|
||||||
|
Loading…
x
Reference in New Issue
Block a user