From: Paul Ramsey <pramsey@cleverelephant.ca>
Date: Mon, 16 Nov 2009 22:01:21 +0000 (+0000)
Subject: Add in hack to match the library .so substition name to the one produced by a particu... 
X-Git-Tag: 1.5.0b1~222
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e3eb9398936a830cb0f5a6250e062b782a28c4dd;p=postgis

Add in hack to match the library .so substition name to the one produced by a particular PgSQL version. (#219)


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

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 014ea01aa..fdbf2971e 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -11,6 +11,14 @@ HAVE_LIBXML2=@HAVE_LIBXML2@
 # colons in drive letters will break PATH.
 PGSQL_BINDIR=$(shell pushd "@PGSQL_BINDIR@" > /dev/null && pwd && popd > /dev/null)
 
+
+# Hack to support the change in .so name from PgSQL 8.3 to 8.4
+# and allow in-place regression testing still. (#219)
+LIBNAME = postgis
+ifeq ($(shell expr $(POSTGIS_PGSQL_VERSION) "<" 84),1)
+	LIBNAME = libpostgis 
+endif
+
 srcdir=$(shell pwd)
 
 # 
@@ -95,7 +103,7 @@ endif
 all: test 
 
 test check: ../postgis/postgis.sql ../loader/pgsql2shp ../loader/shp2pgsql 
-	sed 's,$$libdir/postgis,$(srcdir)/../postgis/libpostgis,g' ../postgis/postgis.sql > postgis.sql
+	sed 's,$$libdir/postgis,$(srcdir)/../postgis/$(LIBNAME),g' ../postgis/postgis.sql > postgis.sql
 	@USE_VERSION=$(POSTGIS_PGSQL_VERSION) ./run_test $(TESTS)