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 3c7cd73b0b028583a0302b81f11034b09ef0394b..84e3e579f34bb153c6f0a22b455a8bbe73ca152c 100644 (file)
--- 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 25067803b032b6135c51b81411a1f1c679aae400..f8decce9f042a18ab2e51349ede4fcabd7684bc5 100755 (executable)
--- 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