From 1b8cb4947726a65be9c54ab756320b5613e7e68f Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Tue, 25 Aug 2015 09:44:58 +0000 Subject: [PATCH] #3262 Fix address_standardizer and postgis_tiger_geocoder extension install git-svn-id: http://svn.osgeo.org/postgis/trunk@13997 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/address_standardizer/Makefile.in | 11 ++++++++--- extensions/postgis_tiger_geocoder/Makefile.in | 2 +- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in index 75a5ac9b2..8d5a41a58 100644 --- a/extensions/address_standardizer/Makefile.in +++ b/extensions/address_standardizer/Makefile.in @@ -34,10 +34,10 @@ 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 +DATA = address_standardizer_data_us.control sql/$(EXTENSION).sql sql/$(EXTENSION)_data_us.sql -all: sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).sql sql/address_standardizer--$(EXTVERSION)--$(EXTVERSION)next.sql sql/address_standardizer--$(EXTVERSION)next--$(EXTVERSION).sql \ -sql/address_standardizer--@POSTGIS_LIB_VERSION@.sql sql/$(EXTENSION)_data_us--@POSTGIS_LIB_VERSION@.sql sql/$(EXTENSION)_data_us--$(EXTVERSION)--$(EXTVERSION)next.sql \ +all: sql/address_standardizer.sql sql/address_standardizer--1.0--$(EXTVERSION).sql sql/address_standardizer--$(EXTVERSION).sql sql/address_standardizer--$(EXTVERSION)--$(EXTVERSION)next.sql sql/address_standardizer--$(EXTVERSION)next--$(EXTVERSION).sql \ + sql/$(EXTENSION)_data_us.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 \ sql/test-init-extensions.sql sql/test-parseaddress.sql sql/test-standardize_address_1.sql sql/test-standardize_address_2.sql @@ -92,6 +92,10 @@ sql/$(EXTENSION)_data_us--$(EXTVERSION).sql: us_lex.sql us_gaz.sql us_rules.sql mkdir -p sql cat $^ > $@ +sql/$(EXTENSION)_data_us.sql: us_lex.sql us_gaz.sql us_rules.sql sql_bits/address_standardizer_data_us_mark_editable_objects.sql.in + mkdir -p sql + cat $^ > $@ + # 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 $^ > $@ @@ -158,6 +162,7 @@ tokenize.o: tokenize.c pagc_api.h std_pg_hash.o: std_pg_hash.c std_pg_hash.h pagc_api.h pagc_std_api.h +#only extension files DATA += $(wildcard sql/*--*.sql) EXTRA_CLEAN += $(wildcard expected/*--*.out) EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in index d1785e4b0..7e70a35b6 100644 --- a/extensions/postgis_tiger_geocoder/Makefile.in +++ b/extensions/postgis_tiger_geocoder/Makefile.in @@ -205,7 +205,7 @@ sql_minor_upgrade: ../postgis_extension_helper.sql sql_bits/remove_from_extensio done #only extension files -DATA = $(wildcard sql/*--*.sql) +DATA = ${EXTENSION}.control sql/$(EXTENSION).sql $(wildcard sql/*--*.sql) EXTRA_CLEAN += $(wildcard expected/*--*.out) EXTRA_CLEAN += sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql endif -- 2.40.0