[postgis-tickets] [SCM] PostGIS branch stable-3.1 updated. 3.1.7-14-g9fc671dc6

[git at osgeo.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "PostGIS".

The branch, stable-3.1 has been updated
       via  9fc671dc6ba021fd036bd74bf281e1d52dc13cb9 (commit)
      from  3e1001ab01b8f8f9d8b5d1f73b68fbee67c4dea6 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 9fc671dc6ba021fd036bd74bf281e1d52dc13cb9
Author: Sandro Santilli <strk at kbt.io>
Date:   Sat Oct 29 16:02:23 2022 +0200

    Encode dependency of unpackaged script on install script

diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 0adf34e95..16885dcfd 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -53,12 +53,6 @@ EXTENSION_UPGRADE_SCRIPTS = \
 	../../doc/postgis_comments.sql \
 	../postgis_extension_helper_uninstall.sql
 
-# Scripts making up the extension upgrade-from-unpackaged file
-# NOTE: order matters
-# TODO: DROPME
-EXTENSION_UNPACKAGED_UPGRADE_SCRIPTS = \
-	sql/$(EXTENSION)--$(EXTVERSION).sql
-
 RASTER_DROP_SCRIPTS = \
 	../../raster/rt_pg/rtpostgis_upgrade_cleanup.sql \
 	../../raster/rt_pg/rtpostgis_drop.sql \
@@ -97,10 +91,10 @@ sql/$(EXTENSION)--$(EXTVERSION).sql: $(EXTENSION_SCRIPTS) | sql
 	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
 	cat $^ >> $@
 
-sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql/$(EXTENSION)--ANY--$(EXTVERSION).sql ../../utils/create_unpackaged.pl Makefile | sql
+sql/$(EXTENSION)--unpackaged--$(EXTVERSION).sql: sql/$(EXTENSION)--ANY--$(EXTVERSION).sql sql/$(EXTENSION)--$(EXTVERSION).sql ../../utils/create_unpackaged.pl Makefile | sql
 	cat sql/$(EXTENSION)--$(EXTVERSION).sql | $(PERL) @top_srcdir@/utils/create_unpackaged.pl postgis > $@
 	# Upgrade after packaging
-	cat $< >> $@
+	cat sql/$(EXTENSION)--ANY--$(EXTVERSION).sql  >> $@
 
 sql/$(EXTENSION)--unpackaged.sql: Makefile | sql
 	echo "-- Nothing to do here" > $@

-----------------------------------------------------------------------

Summary of changes:
 extensions/postgis/Makefile.in | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
PostGIS