From: Sandro Santilli Date: Thu, 6 Dec 2012 18:45:40 +0000 (+0000) Subject: Do not hardcode version to rule to build topology_upgrade_X_minor X-Git-Tag: 2.1.0beta2~319 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a9f17555c147d976c126947430395afcb2a257dc;p=postgis Do not hardcode version to rule to build topology_upgrade_X_minor git-svn-id: http://svn.osgeo.org/postgis/trunk@10807 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/topology/Makefile.in b/topology/Makefile.in index 0a1d68770..06d8e2940 100644 --- a/topology/Makefile.in +++ b/topology/Makefile.in @@ -23,8 +23,10 @@ POSTGIS_PGSQL_VERSION=@POSTGIS_PGSQL_VERSION@ PGIS_MODULE_big=postgis-@POSTGIS_MAJOR_VERSION@.@POSTGIS_MINOR_VERSION@ MODULEDIR=contrib/$(PGIS_MODULE_big) +PGIS_MAJ_MIN=@POSTGIS_MAJOR_VERSION@@POSTGIS_MINOR_VERSION@ + # Files to be copied to the contrib/ directory -DATA_built=topology.sql topology_upgrade_20_minor.sql uninstall_topology.sql +DATA_built=topology.sql topology_upgrade_$(PGIS_MAJ_MIN)_minor.sql uninstall_topology.sql # SQL preprocessor SQLPP = @SQLPP@ @@ -85,7 +87,7 @@ endif topology_upgrade.sql: topology.sql $(PERL) -0777 -ne 's/^(CREATE|ALTER) (CAST|OPERATOR|TYPE|TABLE|SCHEMA|DOMAIN|TRIGGER).*?;//msg;print;' $< > $@ -topology_upgrade_20_minor.sql: topology_drop_before.sql topology_upgrade.sql topology_drop_after.sql +topology_upgrade_$(PGIS_MAJ_MIN)_minor.sql: topology_drop_before.sql topology_upgrade.sql topology_drop_after.sql cat $^ > $@ topology.sql.in: sql/sqlmm.sql.in.c sql/populate.sql.in.c sql/polygonize.sql.in.c sql/gml.sql.in.c sql/query/getnodebypoint.sql.in.c sql/query/getedgebypoint.sql.in.c sql/query/getfacebypoint.sql.in.c sql/query/GetRingEdges.sql.in.c sql/query/GetNodeEdges.sql.in.c sql/manage/TopologySummary.sql.in.c sql/manage/CopyTopology.sql.in.c sql/manage/ManageHelper.sql.in.c sql/topoelement/topoelement_agg.sql.in.c sql/topogeometry/type.sql.in.c sql/topogeometry/totopogeom.sql.in.c sql/predicates.sql.in.c ../postgis/sqldefines.h ../postgis_svn_revision.h