From: Sandro Santilli <strk@keybit.net>
Date: Sat, 5 Apr 2014 12:30:21 +0000 (+0000)
Subject: Fix "make garden" rule (#2701)
X-Git-Tag: 2.2.0rc1~1156
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3ce14b0f6afb29d9e406cb9711fbb585ef0023b0;p=postgis

Fix "make garden" rule (#2701)

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

diff --git a/regress/Makefile.in b/regress/Makefile.in
index 0ccffdea8..10198479d 100644
--- a/regress/Makefile.in
+++ b/regress/Makefile.in
@@ -18,6 +18,8 @@ TMPDIR?=/tmp
 POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@
 POSTGIS_GEOS_VERSION=@POSTGIS_GEOS_VERSION@
 POSTGIS_PROJ_VERSION=@POSTGIS_PROJ_VERSION@
+POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
+POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
 HAVE_JSON=@HAVE_JSON@
 HAVE_SFCGAL=@HAVE_SFCGAL@
 MINGWBUILD=@MINGWBUILD@
@@ -210,7 +212,7 @@ test check: staged-install
 
 garden:
 	createdb postgis_garden
-	createlang plpgsql postgis_garden
+	createlang plpgsql postgis_garden || true # tolerate an error here
 	psql -d postgis_garden < ../postgis/postgis.sql
 	psql -d postgis_garden < ../spatial_ref_sys.sql
 	@echo '-------------------------------------------------'