From: Regina Obe <lr@pcorp.us>
Date: Wed, 8 Aug 2012 06:18:10 +0000 (+0000)
Subject: #1944 Extensions Migration path from 2.1.0 to 2.1.0 - yoyo upgrade to allow upgrade... 
X-Git-Tag: 2.1.0beta2~704
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=1c60419aa0adfb4b55aa1e7a452f71829c8a4293;p=postgis

#1944 Extensions Migration path from 2.1.0 to 2.1.0 - yoyo upgrade to allow upgrade 2.1.0SVN to 2.1.0SVNNext to 2.1.0SVN

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

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 87822a53d..84f275462 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -31,13 +31,17 @@ ifeq ($(PG91),yes)
 sql/$(EXTENSION).sql: sql_bits/postgis.sql sql_bits/postgis_comments.sql sql_bits/rtpostgis.sql sql_bits/mark_editable_objects.sql.in sql_bits/raster_comments.sql sql_bits/spatial_ref_sys.sql
 	cat $^ > $@
 	
-all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql_minor_upgrade
+all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)Next.sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql_minor_upgrade
 
 sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql
 	cp $< $@
 
 sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/postgis--unpackaged.sql.in
 	cp $< $@
+	
+#this is a cludge to allow upgrading from same SVN to same SVN
+sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)Next.sql: sql_bits/postgis_raster_upgrade_minor.sql
+sql/$(EXTENSION)--$(EXTVERSION)Next--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql
 
 #strip BEGIN/COMMIT since these are not allowed in extensions
 sql_bits/spatial_ref_sys.sql: ../../spatial_ref_sys.sql