From: Regina Obe <lr@pcorp.us>
Date: Wed, 10 Oct 2012 22:59:09 +0000 (+0000)
Subject: #1627 : more cleanup of extension install, add configure of tiger extension script... 
X-Git-Tag: 2.1.0beta2~567
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4214b824ddd2a1f0179c60276aa2db440d3ffe3d;p=postgis

#1627 : more cleanup of extension install, add configure of tiger extension script to configure.ac. Fix comment in tiger comments preventing install

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

diff --git a/configure.ac b/configure.ac
index ce0ab76bc..d4bec58fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1103,6 +1103,8 @@ AC_OUTPUT([GNUmakefile
    extensions/postgis/postgis.control 
    extensions/postgis_topology/Makefile 
    extensions/postgis_topology/postgis_topology.control 
+   extensions/postgis_tiger_geocoder/Makefile 
+   extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control 
    liblwgeom/Makefile 
    liblwgeom/cunit/Makefile 
    liblwgeom/liblwgeom.h 
diff --git a/doc/extras_tigergeocoder.xml b/doc/extras_tigergeocoder.xml
index a049ff158..44d9a56ea 100644
--- a/doc/extras_tigergeocoder.xml
+++ b/doc/extras_tigergeocoder.xml
@@ -495,7 +495,7 @@ false
 		  <funcprototype>
 			<funcdef>text <function>get_tract</function></funcdef>
 			<paramdef><type>geometry </type> <parameter> loc_geom</parameter></paramdef>
-			<paramdef choice="opt"><type>text </type> <parameter> output_field='name'</parameter></paramdef>
+			<paramdef choice="opt"><type>text </type> <parameter> output_field=name</parameter></paramdef>
 		  </funcprototype>
 		</funcsynopsis>
 	  </refsynopsisdiv>
diff --git a/extensions/Makefile.in b/extensions/Makefile.in
index 7a7acc10c..b0084f75c 100644
--- a/extensions/Makefile.in
+++ b/extensions/Makefile.in
@@ -1,7 +1,7 @@
 #############################################################################
 #
 # Master makefile used to build extensions
-#
+# Copyright (C) 2012 Regina Obe and Leo Hsu <lr@pcorp.us>
 # Copyright (C) 2012 Sandro Santilli <strk@keybit.net>
 #
 # This is free software; you can redistribute and/or modify it under
@@ -10,7 +10,7 @@
 #############################################################################
 
 SUBDIRS = postgis 
-
+SUBDIRS += postgis_tiger_geocoder 
 ifeq (@TOPOLOGY@,topology)
 	SUBDIRS += postgis_topology
 endif
diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index bc5f28a9c..18da6b5c9 100644
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -38,9 +38,7 @@ sql/$(EXTENSION).sql: sql_bits/tiger_geocoder.sql  sql_bits/mark_editable_object
 #strip BEGIN/COMMIT since these are not allowed in extensions
 #strip CREATE SCHEMA since we force extension 
 # to create schema by setting schema to tiger_geocoder in control
-sql_bits/tiger_geocoder.sql.in: ../../extras/tiger_geocoder/tiger_2011/utility/set_search_path.sql \
-	../../extras/tiger_geocoder/tiger_2011/tables/lookup_tables_2011.sql \
-	../../extras/tiger_geocoder/tiger_2011/geocode_settings.sql \
+sql_bits/tiger_geocoder_minor.sql.in: ../../extras/tiger_geocoder/tiger_2011/utility/set_search_path.sql \
 	../../extras/tiger_geocoder/tiger_2011/utility/utmzone.sql \
 	../../extras/tiger_geocoder/tiger_2011/utility/cull_null.sql \
 	../../extras/tiger_geocoder/tiger_2011/utility/nullable_levenshtein.sql \
@@ -67,6 +65,14 @@ sql_bits/tiger_geocoder.sql.in: ../../extras/tiger_geocoder/tiger_2011/utility/s
 	../../extras/tiger_geocoder/tiger_2011/geocode/reverse_geocode.sql \
 	../../extras/tiger_geocoder/tiger_2011/geocode/census_tracts_functions.sql
 	cat $^ > $@
+	
+sql_bits/tiger_geocoder.sql.in: sql_bits/norm_addy_create.sql.in \
+	../../extras/tiger_geocoder/tiger_2011/utility/set_search_path.sql \
+	../../extras/tiger_geocoder/tiger_2011/tables/lookup_tables_2011.sql \
+	../../extras/tiger_geocoder/tiger_2011/geocode_settings.sql \
+	sql_bits/tiger_geocoder_minor.sql.in
+	cat $^ > $@
+	
 sql_bits/tiger_geocoder.sql: sql_bits/tiger_geocoder.sql.in
 	sed -e 's/BEGIN;//g' -e 's/COMMIT;//g' -e '/^CREATE SCHEMA/d;'  $< > $@
 	
@@ -103,7 +109,7 @@ sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql_bits/tiger_geocoder--unpack
 #aggregates are special 
 #they can be dropped but we need to remove
 #them from the extension first
-sql/tiger_geocoder_upgrade_minor.sql:  sql_bits/tiger_geocoder.sql
+sql/tiger_geocoder_upgrade_minor.sql:  sql_bits/tiger_geocoder_minor.sql.in
 	 sed -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\).*;/d' \
 	 	 -e '/^\(CREATE\|ALTER\) \(CAST\|TYPE\|TABLE\|SCHEMA\|DOMAIN\|TRIGGER\)/,/\;/d' \
 	 	 $< > $@
diff --git a/extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control.in b/extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control.in
index 8a5c0a9a5..033118b81 100644
--- a/extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control.in
+++ b/extensions/postgis_tiger_geocoder/postgis_tiger_geocoder.control.in
@@ -3,4 +3,4 @@ comment = 'PostGIS tiger geocoder and reverse geocoder'
 default_version = '@POSTGIS_LIB_VERSION@'
 relocatable = false
 schema = tiger
-requires = postgis
+requires = 'postgis,fuzzystrmatch'