#2877 -- folder address_standardizer into configure so inherits same versioning as...

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

diff --git a/configure.ac b/configure.ac
index 4d7d7db0024dec5123e2ce7901cdf07fc50b6418..395922ff2fdd422267768176710a34e702c5a845 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1188,6 +1188,8 @@ AC_OUTPUT([GNUmakefile
    extensions/postgis_topology/postgis_topology.control 
    extensions/postgis_tiger_geocoder/Makefile 
    extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control 
+   extensions/address_standardizer/Makefile 
+   extensions/address_standardizer/address_standardizer.control 
    liblwgeom/Makefile 
    liblwgeom/cunit/Makefile 
    liblwgeom/liblwgeom.h 

diff --git a/extensions/address_standardizer/Makefile b/extensions/address_standardizer/Makefile.in
similarity index 75%
rename from extensions/address_standardizer/Makefile
rename to extensions/address_standardizer/Makefile.in
index ed99b8e6f25d8ba48d725852273779d0490c7ccd..d75fc15fb6d8ffa9f2bfee34f161f28d3d971bd8 100644 (file)
--- a/extensions/address_standardizer/Makefile
+++ b/extensions/address_standardizer/Makefile.in
@@ -25,24 +25,37 @@ OBJS_test_main = \
     standard.o \
     tokenize.o
 
-
-MODULE_big = address_standardizer
+POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@
+# SQL preprocessor
+SQLPP = @SQLPP@
+MODULE_big = address_standardizer-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@
 EXTENSION = address_standardizer
-DATA_built = address_standardizer--1.0.sql us-lex.sql us-gaz.sql us-rules.sql
+DATA_built = address_standardizer--@POSTGIS_LIB_VERSION@.sql us-lex.sql us-gaz.sql us-rules.sql
 DOCS = README.address_standardizer
-PG_CPPFLAGS = -g -O0
-SHLIB_LINK = -lpcre
+PG_CPPFLAGS = @CPPFLAGS@ -g -O0
+
+SHLIB_LINK = @SHLIB_LINK@ -lpcre
 EXTRA_CLEAN = usps-st-city-name.txt mk-st-regexp mk-city-regex test_main
 
-PG_CONFIG = pg_config
-PGXS := $(shell $(PG_CONFIG) --pgxs)
-PGVER := $(shell $(PG_CONFIG) --version)
+# PGXS information
+PG_CONFIG = @PG_CONFIG@
+PGXS := @PGXS@
 include $(PGXS)
 
-PERL := $(shell which perl)
+PGVER := $(shell $(PG_CONFIG) --version)
+
+
+# Set PERL _after_ the include of PGXS
+PERL=@PERL@
 
-address_standardizer--1.0.sql: address_standardizer.sql.in
-       $(PERL) mk-sql.pl '$(PGVER)' address_standardizer.sql.in > address_standardizer--1.0.sql
+# Borrow the $libdir substitution from PGXS but customise by running the preprocessor
+# and adding the version number
+%.sql: %.sql.in
+       $(SQLPP) -I../libpgcommon $< | grep -v '^#' | \
+       $(PERL) -lpe "s'MODULE_PATHNAME'\$$libdir/address_standardizer-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@'g" > $@
+       
+address_standardizer--@POSTGIS_LIB_VERSION@.sql: address_standardizer.sql
+       $(PERL) mk-sql.pl '$(PGVER)' address_standardizer.sql > address_standardizer--@POSTGIS_LIB_VERSION@.sql
 
 us-lex.sql: lexicon.csv
        $(PERL) pagc-data-psql lex lexicon.csv > us-lex.sql

diff --git a/extensions/address_standardizer/address_standardizer.control b/extensions/address_standardizer/address_standardizer.control
deleted file mode 100644 (file)
index 85c51df..0000000
--- a/extensions/address_standardizer/address_standardizer.control
+++ /dev/null
@@ -1,4 +0,0 @@
-# address_standardizer extension
-comment = ''
-default_version = '1.0'
-relocatable = true
\ No newline at end of file

diff --git a/extensions/address_standardizer/address_standardizer.control.in b/extensions/address_standardizer/address_standardizer.control.in
new file mode 100644 (file)
index 0000000..a58daad
--- /dev/null
+++ b/extensions/address_standardizer/address_standardizer.control.in
@@ -0,0 +1,4 @@
+# address_standardizer extension
+comment = 'Used to parse an address into constituent elements. Generally used to support geocoding address normalization step.'
+default_version = '@POSTGIS_LIB_VERSION@'
+relocatable = true

diff --git a/extensions/address_standardizer/address_standardizer.sql.in b/extensions/address_standardizer/address_standardizer.sql.in
index 17456abda1cefc172144e99d1b767f487554a140..78e333ea4bf46ac3e824aa9b9618362e737d1964 100644 (file)
--- a/extensions/address_standardizer/address_standardizer.sql.in
+++ b/extensions/address_standardizer/address_standardizer.sql.in
@@ -33,7 +33,7 @@ CREATE OR REPLACE FUNCTION standardize_address(
         micro text,
         macro text )
     RETURNS SETOF stdaddr
-    AS '$libdir/address_standardizer', 'standardize_address'
+    AS  'MODULE_PATHNAME', 'standardize_address'
     LANGUAGE 'c' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION standardize_address(
@@ -42,7 +42,7 @@ CREATE OR REPLACE FUNCTION standardize_address(
         rultab text,
         address text )
     RETURNS SETOF stdaddr
-    AS '$libdir/address_standardizer', 'standardize_address1'
+    AS  'MODULE_PATHNAME', 'standardize_address1'
     LANGUAGE 'c' IMMUTABLE STRICT;
 
 CREATE OR REPLACE FUNCTION parse_address(IN text,
@@ -56,6 +56,6 @@ CREATE OR REPLACE FUNCTION parse_address(IN text,
         OUT zipplus text,
         OUT country text)
     RETURNS record
-    AS '$libdir/address_standardizer', 'parse_address'
+    AS  'MODULE_PATHNAME', 'parse_address'
     LANGUAGE 'c' IMMUTABLE STRICT;