From f95ed8ece94b437cdb71a1490c21aacb6a7d0742 Mon Sep 17 00:00:00 2001 From: Regina Obe Date: Thu, 9 Aug 2012 15:54:52 +0000 Subject: [PATCH] #1944: Support for 2.1.0SVN/2.1.0SVN extension for topology ALTER EXTENSION postgis_topology UPDATE TO "2.1.0SVNnext"; ALTER EXTENSION postgis_topology UPDATE TO "2.1.0SVN"; git-svn-id: http://svn.osgeo.org/postgis/trunk@10175 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/postgis_topology/Makefile.in | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in index a75d8309e..af882a2f8 100644 --- a/extensions/postgis_topology/Makefile.in +++ b/extensions/postgis_topology/Makefile.in @@ -27,7 +27,7 @@ EXTRA_CLEAN += sql/*.sql ${SQL_BITS} ifeq ($(PG91),yes) -all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql_minor_upgrade +all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql sql_minor_upgrade sql/$(EXTENSION)--$(EXTVERSION).sql: sql/$(EXTENSION).sql mkdir -p sql @@ -37,6 +37,12 @@ sql/$(EXTENSION).sql: sql_bits/topology.sql sql_bits/mark_editable_objects.sql. mkdir -p sql cat $^ > $@ +#this is a cludge to allow upgrading from same SVN to same SVN +sql/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql + cat $^ > $@ +sql/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql: ../postgis_extension_helper.sql sql_bits/remove_from_extension.sql.in sql/topology_upgrade_minor.sql sql_bits/mark_editable_objects.sql.in sql_bits/topology_comments.sql ../postgis_extension_helper_uninstall.sql + cat $^ > $@ + #strip BEGIN/COMMIT since these are not allowed in extensions #strip CREATE SCHEMA since we force extension # to create schema by setting schema to topology in control -- 2.40.0