Make sure the build tree is before the source tree in the include path.

diff --git a/src/Makefile.global.in b/src/Makefile.global.in
index a9cbabe0b3896bccf6f580a7ef2d603232fcc62f..a447d4e87c3e4a070f18f42d59b03882f5a9604e 100644 (file)
--- a/src/Makefile.global.in
+++ b/src/Makefile.global.in
@@ -1,5 +1,5 @@
 # -*-makefile-*-
-# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.130 2001/07/10 16:33:01 petere Exp $
+# $Header: /cvsroot/pgsql/src/Makefile.global.in,v 1.131 2001/07/15 11:20:01 petere Exp $
 
 #------------------------------------------------------------------------------
 # All PostgreSQL makefiles include this file and use the variables it sets,
@@ -146,7 +146,10 @@ DOCBOOKSTYLE       = @DOCBOOKSTYLE@
 
 CPP = @CPP@
 CPPFLAGS = @CPPFLAGS@
-override CPPFLAGS := $(sort -I$(top_srcdir)/src/include -I$(top_builddir)/src/include) $(CPPFLAGS)
+override CPPFLAGS := -I$(top_srcdir)/src/include $(CPPFLAGS)
+ifdef VPATH
+override CPPFLAGS := -I$(top_builddir)/src/include $(CPPFLAGS)
+endif
 
 CC = @CC@
 GCC = @GCC@