From 9b1e0eb2e1069964e8208208d52b491f8562cb02 Mon Sep 17 00:00:00 2001 From: Sandro Santilli Date: Sun, 22 Oct 2017 21:27:06 +0000 Subject: [PATCH] Make upgrade install rule always run when asked (no deps) git-svn-id: http://svn.osgeo.org/postgis/trunk@16053 b70326c6-7e19-0410-871a-916f4a2858ee --- extensions/postgis/Makefile.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in index 0dc25b895..e6e00d95d 100644 --- a/extensions/postgis/Makefile.in +++ b/extensions/postgis/Makefile.in @@ -63,7 +63,7 @@ EXTRA_CLEAN += ${SQL_BITS} sql/*.sql CURV_big=@POSTGIS_MAJOR_VERSION@@POSTGIS_MINOR_VERSION@ -all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql +all: sql/$(EXTENSION)--$(EXTVERSION).sql sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql sql/$(EXTENSION)--ANY--$(EXTVERSION).sql sql/$(EXTENSION).sql: $(EXTENSION_SCRIPTS) | sql printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@ @@ -131,7 +131,7 @@ sql_bits/raster_comments.sql: ../../doc/raster_comments.sql | sql_bits cp $< $@ #postgis_extension_upgrade_minor.sql is the one that contains both postgis AND raster -sql_bits/postgis_extension_upgrade_minor.sql: $(EXTENSION_UPGRADE_SCRIPTS) | sql_bits +sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS) | sql printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@ cat $^ >> $@ @@ -141,9 +141,9 @@ install: install-upgrade-paths # The "next" lines are a cludge to allow upgrading between different # revisions of the same version -install-upgrade-paths: sql_bits/postgis_extension_upgrade_minor.sql +install-upgrade-paths: tpl='$(EXTENSION)--ANY--$(EXTVERSION).sql'; \ - $(INSTALL_DATA) $^ "$(EXTDIR)/$${tpl}"; \ + $(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \ ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--$(EXTVERSION)next.sql; \ ln -fs "$${tpl}" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)next--$(EXTVERSION).sql; \ for OLD_VERSION in $(UPGRADEABLE_VERSIONS); do \ -- 2.40.0