Do not mark extention objects during pre-extension upgrades

Fixes CREATE EXTENSION postgis_topology FROM unpackaged
Closes #2503

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

diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 5fa959fcaa00f013a5c852de609592574a78009e..ed9edac711660ed8ff2f63fbda0f5672a05267b7 100644 (file)
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -73,10 +73,10 @@ sql_bits/topology.sql: ../../topology/topology.sql
 sql_bits/topology_comments.sql: ../../doc/topology_comments.sql
        cp $< $@
 
-sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../../utils/create_unpackaged.pl sql/$(EXTENSION)--ANY--$(EXTVERSION).sql Makefile
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: ../../topology/topology.sql ../../utils/create_unpackaged.pl sql/topology_upgrade.sql Makefile
        mkdir -p sql
        # Ugprade before packaging
-       cat sql/$(EXTENSION)--ANY--$(EXTVERSION).sql > $@
+       cat sql/topology_upgrade.sql > $@
        cat $< | $(PERL) ../../utils/create_unpackaged.pl postgis_topology >> $@
 
 #upgrade script should have everything but table, schema, type creation/alter