From fe864c5d75e862d233730a857a6ec004a7e10a77 Mon Sep 17 00:00:00 2001
From: Regina Obe <lr@pcorp.us>
Date: Sat, 27 Jun 2015 16:54:43 +0000
Subject: [PATCH] #3183 baby step - ability to do: ALTER EXTENSION
 address_standardizer_data_us UPDATE TO "2.2.0devnext"; ALTER EXTENSION
 address_standardizer_data_us UPDATE TO "2.2.0dev";

git-svn-id: http://svn.osgeo.org/postgis/trunk@13725 b70326c6-7e19-0410-871a-916f4a2858ee
---
 extensions/address_standardizer/Makefile.in | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 348d97aae..d2aea2ec8 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -28,10 +28,12 @@ OBJS_test_main = \
 POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@
 # SQL preprocessor
 SQLPP = @SQLPP@
+EXTVERSION    = @POSTGIS_LIB_VERSION@
+MINORVERSION  = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 MODULE_big = address_standardizer-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 EXTENSION = address_standardizer
 DATA = address_standardizer_data_us.control us_lex.sql us_gaz.sql us_rules.sql
-DATA_built = sql/address_standardizer.sql sql/address_standardizer--@POSTGIS_LIB_VERSION@.sql sql/address_standardizer_data_us--@POSTGIS_LIB_VERSION@.sql
+DATA_built = sql/address_standardizer.sql sql/address_standardizer--@POSTGIS_LIB_VERSION@.sql sql/$(EXTENSION)_data_us--@POSTGIS_LIB_VERSION@.sql   sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql
 DOCS = README.address_standardizer
 PG_CPPFLAGS = @CPPFLAGS@ -g -O0
 
@@ -63,12 +65,17 @@ sql/address_standardizer--@POSTGIS_LIB_VERSION@.sql: sql/address_standardizer.sq
 	cat $^ > $@
 
 # build us data extension
-sql/address_standardizer_data_us--@POSTGIS_LIB_VERSION@.sql: us_lex.sql us_gaz.sql us_rules.sql
+sql/$(EXTENSION)_data_us--$(EXTVERSION).sql: us_lex.sql us_gaz.sql us_rules.sql
 	mkdir -p sql
 	cat $^ > $@
 	
-sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql
+# upgrade logic for us data extension (to go to next cludge for dev upgrading)
+sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
 	cat $^ > $@
+
+# upgrade logic for us data extension (to go to original round-robin yoyo cludge for dev upgrading)
+sql/$(EXTENSION)_data_us--$(EXTVERSION)next--$(EXTVERSION).sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql
+	cat $^ > $@	
 	
 mk-st-regexp: mk-st-regexp.pl
 	$(PERL) -c mk-st-regexp.pl
-- 
2.50.0