[postgis-tickets] r17482 - Include version number in address_standardizer lib

[Raul]

Author: algunenano
Date: 2019-06-10 08:12:25 -0700 (Mon, 10 Jun 2019)
New Revision: 17482

Modified:
   trunk/NEWS
   trunk/extensions/address_standardizer/Makefile.in
Log:
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



Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2019-06-10 13:56:14 UTC (rev 17481)
+++ trunk/NEWS	2019-06-10 15:12:25 UTC (rev 17482)
@@ -17,6 +17,7 @@
           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 @@
   - #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)

Modified: trunk/extensions/address_standardizer/Makefile.in
===================================================================
--- trunk/extensions/address_standardizer/Makefile.in	2019-06-10 13:56:14 UTC (rev 17481)
+++ trunk/extensions/address_standardizer/Makefile.in	2019-06-10 15:12:25 UTC (rev 17482)
@@ -29,9 +29,13 @@
 # SQL preprocessor
 SQLPP = @SQLPP@
 GREP=@GREP@
-EXTVERSION    = @POSTGIS_LIB_VERSION@
-MINORVERSION  = @POSTGIS_MAJOR_VERSION at .@POSTGIS_MINOR_VERSION@
-MODULE_big = address_standardizer
+EXTVERSION = @POSTGIS_LIB_VERSION@
+MODULE_big = address_standardizer- at POSTGIS_MAJOR_VERSION@
+MODULEPATH    = $$libdir/address_standardizer- at POSTGIS_MAJOR_VERSION@
+ifeq (@LIBINCLUDEMINORVERSION@,yes)
+MODULE_big = address_standardizer- at POSTGIS_MAJOR_VERSION@. at POSTGIS_MINOR_VERSION@
+MODULEPATH    = $$libdir/address_standardizer- at POSTGIS_MAJOR_VERSION@. at POSTGIS_MINOR_VERSION@
+endif
 EXTENSION = address_standardizer
 DATA = sql/$(EXTENSION).sql sql/$(EXTENSION)_data_us.sql
 
@@ -62,7 +66,7 @@
 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 $< \