Fix include paths for case of VPATH build.

tglsfdc · tglsfdc · commit d079c419d21c · 2002-01-09T00:06:42.000Z
diff --git a/src/backend/bootstrap/Makefile b/src/backend/bootstrap/Makefile
@@ -2,14 +2,16 @@
 #
 # 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 $
 #
 #-------------------------------------------------------------------------
 
 subdir = src/backend/bootstrap
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
+override CPPFLAGS := -I$(srcdir) $(CPPFLAGS)
+
 # qnx4's wlink currently crashes with bootstrap.o
 ifneq ($(PORTNAME), qnx4)
 OBJS= bootparse.o bootscanner.o bootstrap.o 
diff --git a/src/interfaces/ecpg/preproc/Makefile b/src/interfaces/ecpg/preproc/Makefile
@@ -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
 top_builddir = ../../../..
@@ -8,7 +8,7 @@ MAJOR_VERSION=2
 MINOR_VERSION=9
 PATCHLEVEL=0
 
-override CPPFLAGS := -I$(srcdir)/../include $(CPPFLAGS) \
+override CPPFLAGS := -I$(srcdir)/../include -I$(srcdir) $(CPPFLAGS) \
 	-DMAJOR_VERSION=$(MAJOR_VERSION) \
 	-DMINOR_VERSION=$(MINOR_VERSION) -DPATCHLEVEL=$(PATCHLEVEL) \
 	-DINCLUDE_PATH=\"$(includedir)\" 

Original file line number	Diff line number	Diff line change
`@@ -2,14 +2,16 @@`
`2`	`2`	`#`
`3`	`3`	`# Makefile for the bootstrap module`
`4`	`4`	`#`
`5`		`-# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.29 2001/11/16 16:32:33 petere Exp $`
	`5`	`+# $Header: /cvsroot/pgsql/src/backend/bootstrap/Makefile,v 1.30 2002/01/09 00:06:42 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)`
	`14`	`+`
`13`	`15`	`# qnx4's wlink currently crashes with bootstrap.o`
`14`	`16`	`ifneq ($(PORTNAME), qnx4)`
`15`	`17`	`OBJS= bootparse.o bootscanner.o bootstrap.o`