From 572d23937c8ba2b0a93a1a73afebfd90a7e1e25f Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Wed, 8 Jul 2009 16:03:36 +0000 Subject: [PATCH] Pre-install check rule by Paul cleaned up to allow top-level run and correct dependencies. See issue #219. git-svn-id: http://svn.osgeo.org/postgis/trunk@4284 b70326c6-7e19-0410-871a-916f4a2858ee --- regress/Makefile.in | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/regress/Makefile.in b/regress/Makefile.in index 0869c2d33..39b81d25d 100644 --- a/regress/Makefile.in +++ b/regress/Makefile.in @@ -5,6 +5,8 @@ POSTGIS_GEOS_VERSION=@POSTGIS_GEOS_VERSION@ POSTGIS_PROJ_VERSION=@POSTGIS_PROJ_VERSION@ PGSQL_BINDIR=@PGSQL_BINDIR@ +srcdir=$(shell pwd) + # # Put path from pg_config into front of search path # @@ -77,12 +79,12 @@ endif all: test -test check: ../postgis/postgis.so ../loader/pgsql2shp ../loader/shp2pgsql - cp ../postgis/postgis.sql . +test check: ../postgis/postgis.sql ../loader/pgsql2shp ../loader/shp2pgsql + sed 's,$$libdir/postgis,$(srcdir)/../postgis/libpostgis,g' ../postgis/postgis.sql > postgis.sql @USE_VERSION=$(POSTGIS_PGSQL_VERSION) ./run_test $(TESTS) -../postgis/postgis.so: +../postgis/postgis.sql: $(MAKE) -C ../postgis ../loader/pgsql2shp ../loader/shp2pgsql: -- 2.50.1