]> granicus.if.org Git - postgis/commitdiff
Fix for #192.
authorPaul Ramsey <pramsey@cleverelephant.ca>
Thu, 4 Jun 2009 14:17:07 +0000 (14:17 +0000)
committerPaul Ramsey <pramsey@cleverelephant.ca>
Thu, 4 Jun 2009 14:17:07 +0000 (14:17 +0000)
git-svn-id: http://svn.osgeo.org/postgis/trunk@4134 b70326c6-7e19-0410-871a-916f4a2858ee

regress/Makefile.in
regress/run_test

index 84e3e579f34bb153c6f0a22b455a8bbe73ca152c..60080404fdd50ee3a7cb7c40c095ebac01a99d2e 100644 (file)
@@ -5,6 +5,13 @@ POSTGIS_GEOS_VERSION=@POSTGIS_GEOS_VERSION@
 POSTGIS_PROJ_VERSION=@POSTGIS_PROJ_VERSION@
 PGSQL_BINDIR=@PGSQL_BINDIR@
 
+# 
+# Put path from pg_config into front of search path
+#
+PATH := $(PGSQL_BINDIR):$(PATH)
+export PATH
+
+
 TESTS = \
        loader/Point \
        loader/PointM \
@@ -63,7 +70,7 @@ all: test
 
 test check: ../postgis/postgis.so ../loader/pgsql2shp ../loader/shp2pgsql 
        cp ../postgis/postgis.sql .
-       $(shell USE_VERSION=$(POSTGIS_PGSQL_VERSION) USE_PATH=$(PGSQL_BINDIR) ./run_test $(TESTS))
+       @USE_VERSION=$(POSTGIS_PGSQL_VERSION) ./run_test $(TESTS)
 
 
 ../postgis/postgis.so:
index f8decce9f042a18ab2e51349ede4fcabd7684bc5..b0f770ef048ef95dcaf46a7d2fc663e321d13038 100755 (executable)
@@ -25,9 +25,7 @@ if [ -n "$USE_VERSION" ]; then
        fi
 fi
 
-if [ -n "$USE_PATH" ]; then
-       export PATH=${USE_PATH}:${PATH}
-fi
+
 
 PSQL="psql"
 
@@ -438,6 +436,7 @@ libbuilddate=`${PSQL} -tAc "select postgis_lib_build_date()" "${DB}"`
 pgsqlver=`${PSQL} -tAc "select version()" "${DB}"`
 
 echo "TMPDIR is ${TMPDIR}"
+echo "PATH is ${PATH}"
 
 echo
 echo " $pgsqlver"