From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Wed, 3 Jun 2009 23:07:48 +0000 (+0000)
Subject: Fix for issue #186
X-Git-Tag: 1.4.0b1~25
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bc9640ffcb36127fc2e869aac7cfbb51f8018606;p=postgis

Fix for issue #186


git-svn-id: http://svn.osgeo.org/postgis/trunk@4131 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 3c7cd73b0..84e3e579f 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -3,6 +3,7 @@ TMPDIR?=/tmp
 POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@
 POSTGIS_GEOS_VERSION=@POSTGIS_GEOS_VERSION@
 POSTGIS_PROJ_VERSION=@POSTGIS_PROJ_VERSION@
+PGSQL_BINDIR=@PGSQL_BINDIR@
 
 TESTS = \
 	loader/Point \
@@ -62,7 +63,8 @@ all: test
 
 test check: ../postgis/postgis.so ../loader/pgsql2shp ../loader/shp2pgsql 
 	cp ../postgis/postgis.sql .
-	@USE_VERSION="$(POSTGIS_PGSQL_VERSION)" ./run_test $(TESTS)
+	$(shell USE_VERSION=$(POSTGIS_PGSQL_VERSION) USE_PATH=$(PGSQL_BINDIR) ./run_test $(TESTS))
+
 
 ../postgis/postgis.so:
 	$(MAKE) -C ../postgis
diff --git a/regress/run_test b/regress/run_test
index 25067803b..f8decce9f 100755
--- a/regress/run_test
+++ b/regress/run_test
@@ -25,6 +25,10 @@ if [ -n "$USE_VERSION" ]; then
 	fi
 fi
 
+if [ -n "$USE_PATH" ]; then
+	export PATH=${USE_PATH}:${PATH}
+fi
+
 PSQL="psql"
 
 if [ -z "$TMPDIR" ]; then