From cb6edf9d56019a1a3d9fd3df0dfe4a3ca1e7daab Mon Sep 17 00:00:00 2001
From: Peter Eisentraut
Date: Tue, 20 Feb 2001 19:20:30 +0000
Subject: Make sure -L and -I's for our source tree are always before system
 include or library directories on the command line.

---
 src/test/bench/Makefile      | 4 ++--
 src/test/examples/Makefile   | 2 +-
 src/test/regress/GNUmakefile | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'src/test')

diff --git a/src/test/bench/Makefile b/src/test/bench/Makefile
index 97ab8247092..4f8e8b2e092 100644
--- a/src/test/bench/Makefile
+++ b/src/test/bench/Makefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.8 2000/10/20 21:04:19 petere Exp $
+#    $Header: /cvsroot/pgsql/src/test/bench/Attic/Makefile,v 1.9 2001/02/20 19:20:29 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -18,7 +18,7 @@ include $(top_builddir)/src/Makefile.global
 CREATEFILES= create.sql bench.sql
 OUTFILES= bench.out bench.out.perquery
 
-override CPPFLAGS += -I$(libpq_srcdir)
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 
diff --git a/src/test/examples/Makefile b/src/test/examples/Makefile
index d811a7030cb..c5ee425f3b5 100644
--- a/src/test/examples/Makefile
+++ b/src/test/examples/Makefile
@@ -6,7 +6,7 @@ subdir = src/test/examples
 top_builddir = ../../..
 include $(top_builddir)/src/Makefile.global
 
-override CPPFLAGS+= -I$(libpq_srcdir)
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 LIBS += $(libpq)
 
 
diff --git a/src/test/regress/GNUmakefile b/src/test/regress/GNUmakefile
index dc737b0f900..71bca870580 100644
--- a/src/test/regress/GNUmakefile
+++ b/src/test/regress/GNUmakefile
@@ -7,7 +7,7 @@
 #
 #
 # IDENTIFICATION
-#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.32 2000/11/22 13:16:24 petere Exp $
+#    $Header: /cvsroot/pgsql/src/test/regress/GNUmakefile,v 1.33 2001/02/20 19:20:30 petere Exp $
 #
 #-------------------------------------------------------------------------
 
@@ -17,7 +17,7 @@ include $(top_builddir)/src/Makefile.global
 
 contribdir := $(top_builddir)/contrib
 
-override CPPFLAGS += -I$(libpq_srcdir)
+override CPPFLAGS := -I$(libpq_srcdir) $(CPPFLAGS)
 override CFLAGS += $(CFLAGS_SL)
 
 
-- 
cgit v1.2.3