From: Sandro Santilli <strk@keybit.net>
Date: Wed, 6 Jan 2016 15:09:39 +0000 (+0000)
Subject: Use a better name for the postgis extension upgrade template file
X-Git-Tag: 2.3.0beta1~292
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8091b36fb1e40e4f2b4942ba1a24fda3aa544088;p=postgis

Use a better name for the postgis extension upgrade template file

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

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index df89dbf22..9020027cf 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -50,9 +50,9 @@ sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../postgis/postgis.sql ../..
 	cat ../../postgis/postgis.sql ../../raster/rt_pg/rtpostgis.sql | $(PERL) ../../utils/create_unpackaged.pl postgis > $@
 	
 #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)--$(EXTVERSION)next.sql: sql_bits/postgis_extension_upgrade_minor.sql
 	cp $< $@
-sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql_bits/postgis_raster_upgrade_minor.sql
+sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql_bits/postgis_extension_upgrade_minor.sql
 	cp $< $@
 
 #strip BEGIN/COMMIT since these are not allowed in extensions
@@ -100,14 +100,13 @@ sql_bits/postgis_upgrade.sql: ../../postgis/postgis_upgrade.sql
 sql_bits/raster_comments.sql: ../../doc/raster_comments.sql
 	cp $< $@
 
-#postgis_raster_upgrade_minor.sql is the one that contains both postgis AND raster
-#TODO: come up with a better name
+#postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster
 #TODO: what about postgis_drop_after.sql ? where does it fit ??
-sql_bits/postgis_raster_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
+sql_bits/postgis_extension_upgrade_minor.sql: ../postgis_extension_helper.sql sql_bits/postgis_upgrade.sql sql_bits/rtpostgis_upgrade.sql ../../doc/raster_comments.sql ../../doc/postgis_comments.sql ../postgis_extension_helper_uninstall.sql
 	echo '\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \quit' > $@
 	cat $^ >> $@
 
-sql_minor_upgrade: sql_bits/postgis_raster_upgrade_minor.sql
+sql_minor_upgrade: sql_bits/postgis_extension_upgrade_minor.sql
 	for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \
   	  cat $< > sql/$(EXTENSION)--$$OLD_VERSION--$(EXTVERSION).sql; \
 	done