[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-660-g3d41b08dc

Tue Feb 21 16:11:17 PST 2023

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, master has been updated
       via  3d41b08dc006e9b838da9d449b40ee9af74b2ce6 (commit)
      from  83e7f6cd7e6de93c785b540ccb6da8a45537955a (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 3d41b08dc006e9b838da9d449b40ee9af74b2ce6
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Feb 22 00:42:23 2023 +0100

    Fix distlean
    
    - Run clean on loader's distclean
    - Do not generate extensions/upgrade-paths-rules.mk
    
    Move the hint about install-extension-upgrades-from-known-versions
    in top-level GNUMakefile
    
    Closes #5346

diff --git a/.gitignore b/.gitignore
index 2a8570a43..8485dcc10 100644
--- a/.gitignore
+++ b/.gitignore
@@ -44,7 +44,6 @@ doc/raster_gardentest_*.sql
 doc/tiger_geocoder_comments.sql
 doc/topology_comments.sql
 extensions/Makefile
-extensions/upgrade-paths-rules.mk
 extensions/address_standardizer/Makefile
 extensions/address_standardizer/mk-st-regexp
 extensions/address_standardizer/address_standardizer--*.sql
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 8c265bc4f..17d43cc60 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -29,8 +29,10 @@ all install uninstall noop clean distclean check-unit:
 	@if test x"$@" = xall; then \
 		echo "PostGIS was built successfully. Ready to install."; \
 	fi
-ifneq (@INSTALL_EXTENSION_UPGRADES@,yes)
 ifneq (@EXTENSIONS@,)
+ifeq (@INSTALL_EXTENSION_UPGRADES@, yes)
+	$(MAKE) install-extension-upgrades-from-known-versions
+else
 	@if test x"$@" = xinstall; then \
 		echo; \
 		echo "PostGIS extensions installed, upgrade scripts retained."; \
diff --git a/configure.ac b/configure.ac
index 80cd6c8dc..e4cd41603 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1738,7 +1738,6 @@ dnl echo "TRANSLATIONS_MAKEFILE_LIST: ${TRANSLATIONS_MAKEFILE_LIST}"
 
 AC_CONFIG_FILES([GNUmakefile
    extensions/Makefile
-   extensions/upgrade-paths-rules.mk
    extensions/postgis/Makefile
    extensions/postgis_topology/Makefile
    extensions/postgis_tiger_geocoder/Makefile
diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 5fac487c5..cbf35ae28 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -119,7 +119,7 @@ sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
 sql/$(EXTENSION)_data_us--ANY--$(EXTVERSION).sql: sql/$(EXTENSION)_data_us--$(EXTVERSION).sql | sql
 	cat $^ > $@
 
-include ../upgrade-paths-rules.mk
+include @srcdir@/../upgrade-paths-rules.mk
 
 # TODO: fix this by moving data in their own directories
 ifeq ($(EXTENSION_DATA_INSTALL),)
diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 4cd1bdcb2..1d5619bc4 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -140,7 +140,7 @@ sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS) | sql
 	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
 	cat $^ >> $@
 
-include ../upgrade-paths-rules.mk
+include @srcdir@/../upgrade-paths-rules.mk
 
 distclean: clean
 	rm -f Makefile
diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index bb78d7a23..1d061f114 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -122,7 +122,7 @@ sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS) | sql
 	printf '\\echo Use "CREATE EXTENSION $(EXTENSION)" to load this file. \\quit\n' > $@
 	cat $^ >> $@
 
-include ../upgrade-paths-rules.mk
+include @srcdir@/../upgrade-paths-rules.mk
 
 distclean: clean
 	rm -f Makefile
diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index 73f828b5b..6acb88a6b 100644
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -94,7 +94,7 @@ sql/sfcgal_upgrade_minor.sql: ../postgis_extension_helper.sql sql/sfcgal_upgrade
 sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
 	cat $(EXTENSION_UPGRADE_SCRIPTS) > $@
 
-include ../upgrade-paths-rules.mk
+include @srcdir@/../upgrade-paths-rules.mk
 
 distclean: clean
 	rm Makefile
diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index de3d37f57..8c7df1532 100644
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -205,7 +205,7 @@ sql/tiger_geocoder_upgrade_minor.sql:  sql/tiger_geocoder_minor.sql.in | sql
 #only extension files
 EXTRA_CLEAN += $(wildcard expected/*--*.out)
 
-include ../upgrade-paths-rules.mk
+include @srcdir@/../upgrade-paths-rules.mk
 
 distclean: clean
 	rm Makefile
diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 763fdb5ac..e63f8f3d1 100644
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -99,7 +99,7 @@ sql/topology_upgrade.sql:  ../../topology/topology_upgrade.sql | sql
 sql/$(EXTENSION)--ANY--$(EXTVERSION).sql: $(EXTENSION_UPGRADE_SCRIPTS)
 	cat $^ > $@
 
-include ../upgrade-paths-rules.mk
+include @srcdir@/../upgrade-paths-rules.mk
 
 distclean: clean
 	rm Makefile
diff --git a/extensions/upgrade-paths-rules.mk.in b/extensions/upgrade-paths-rules.mk
similarity index 93%
rename from extensions/upgrade-paths-rules.mk.in
rename to extensions/upgrade-paths-rules.mk
index 6759dd32a..b82d7c68f 100644
--- a/extensions/upgrade-paths-rules.mk.in
+++ b/extensions/upgrade-paths-rules.mk
@@ -23,9 +23,6 @@ install-upgrade-paths: tag-as-any
 	$(INSTALL_DATA) sql/$${tpl} "$(EXTDIR)/$${tpl}"; \
 	$(INSTALL_DATA) "sql/$(TAG_UPGRADE)" "$(EXTDIR)/$(TAG_UPGRADE)"; \
 	ln -fs "$(TAG_UPGRADE)" $(EXTDIR)/$(EXTENSION)--$(EXTVERSION)--ANY.sql;
-ifeq (@INSTALL_EXTENSION_UPGRADES@,yes)
-	$(MAKE) install-extension-upgrades-from-known-versions
-endif
 
 install-extension-upgrades-from-known-versions:
 	$(PERL) $(top_srcdir)/loader/postgis.pl \
diff --git a/loader/Makefile.in b/loader/Makefile.in
index 7db7c82f8..06dd74e1b 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -177,7 +177,7 @@ clean:
 	rm -f *.o $(SHP2PGSQL-CLI) $(PGSQL2SHP-CLI) $(GTK_WIN32_RES) $(SHP2PGSQL-GUI) $(POSTGIS-CLI)
 	$(MAKE) -C cunit clean
 
-distclean:
+distclean: clean
 	$(MAKE) -C cunit distclean
 	rm -f Makefile
 

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

Summary of changes:
 .gitignore                                                       | 1 -
 GNUmakefile.in                                                   | 4 +++-
 configure.ac                                                     | 1 -
 extensions/address_standardizer/Makefile.in                      | 2 +-
 extensions/postgis/Makefile.in                                   | 2 +-
 extensions/postgis_raster/Makefile.in                            | 2 +-
 extensions/postgis_sfcgal/Makefile.in                            | 2 +-
 extensions/postgis_tiger_geocoder/Makefile.in                    | 2 +-
 extensions/postgis_topology/Makefile.in                          | 2 +-
 extensions/{upgrade-paths-rules.mk.in => upgrade-paths-rules.mk} | 3 ---
 loader/Makefile.in                                               | 2 +-
 11 files changed, 10 insertions(+), 13 deletions(-)
 rename extensions/{upgrade-paths-rules.mk.in => upgrade-paths-rules.mk} (93%)


hooks/post-receive
-- 
PostGIS
