Include version number in address_standardizer lib

Reverts r15933
Closes https://trac.osgeo.org/postgis/ticket/4414
Closes https://github.com/postgis/postgis/pull/413

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

diff --git a/NEWS b/NEWS
index 55362730aac2230e7496d28aee4ed74cd66a1bdd..7b8cad8b383e492cd607e372dbb660741bfa0652 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,7 @@ Additional features enabled if you are running Proj6+ and PostgreSQL 12
           from 2.5 (Raúl Marín)
   - #4198, Add ST_ConstrainedDelaunayTriangles SFCGAL function (Darafei
            Praliaskouski)
+  - #4414, Include version number in address_standardizer lib (Raúl Marín)
 
 PostGIS 3.0.0alpha1
 2019/05/26
@@ -71,6 +72,7 @@ PostGIS 3.0.0
   - #4331, ST_3DMakeBox now returns error instead of a miniscule box (Regina Obe)
   - #4342, Removed "versioned" variants of ST_AsGeoJSON and ST_AsKML (Paul Ramsey)
   - #4356, ST_Accum removed. Use array_agg instead. (Darafei Praliaskouski)
+  - #4414, Include version number in address_standardizer lib (Raúl Marín)
 
 * New Features *
   - #2902, postgis_geos_noop (Sandro Santilli)

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 1d84c5e077d1d1711827fafb9b667db57d3a8022..a5e8139053068a7f6fee44144d82a6496ab86b8d 100644 (file)
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -29,9 +29,13 @@ POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@
 # SQL preprocessor
 SQLPP = @SQLPP@
 GREP=@GREP@
-EXTVERSION    = @POSTGIS_LIB_VERSION@
-MINORVERSION  = @POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
-MODULE_big = address_standardizer
+EXTVERSION = @POSTGIS_LIB_VERSION@
+MODULE_big = address_standardizer-@POSTGIS_MAJOR_VERSION@
+MODULEPATH    = $$libdir/address_standardizer-@POSTGIS_MAJOR_VERSION@
+ifeq (@LIBINCLUDEMINORVERSION@,yes)
+MODULE_big = address_standardizer-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
+MODULEPATH    = $$libdir/address_standardizer-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
+endif
 EXTENSION = address_standardizer
 DATA = sql/$(EXTENSION).sql sql/$(EXTENSION)_data_us.sql
 
@@ -62,7 +66,7 @@ REGRESS = test-init-extensions test-parseaddress test-standardize_address_1 test
 sql/%.sql: %.sql.in
        mkdir -p sql
        $(SQLPP) -I../libpgcommon $< | grep -v '^#' | \
-       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/${EXTENSION}'g" > $@
+       $(PERL) -lpe "s'MODULE_PATHNAME'\$(MODULEPATH)'g" > $@
 
 %.control: %.control.in Makefile
        cat $< \