[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-119-gd5033aa5e

[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, master has been updated
       via  d5033aa5e19f1b8fe64b056b0a073dc352e2e3db (commit)
      from  6b60b5644c05917f09fb75894174e9bc1dc66834 (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 d5033aa5e19f1b8fe64b056b0a073dc352e2e3db
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Sep 20 09:57:12 2022 +0200

    Run postgis from srcdir, so to not bother with exe suffix
    
    Should fix #5246

diff --git a/extensions/address_standardizer/Makefile.in b/extensions/address_standardizer/Makefile.in
index 0964ea1b0..d8fb62d25 100644
--- a/extensions/address_standardizer/Makefile.in
+++ b/extensions/address_standardizer/Makefile.in
@@ -205,6 +205,7 @@ include $(PGXS)
 PERL = @PERL@
 
 srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 abs_topbuilddir=$(abspath $(top_builddir))
 
diff --git a/extensions/postgis/Makefile.in b/extensions/postgis/Makefile.in
index 404fb6686..53b1026e1 100644
--- a/extensions/postgis/Makefile.in
+++ b/extensions/postgis/Makefile.in
@@ -162,5 +162,8 @@ PERL = @PERL@
 
 VPATH = @srcdir@
 
+# TODO: fix this, if srcdir is set, install of .control file fails
+#srcdir = @srcdir@
+top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 abs_topbuilddir=$(abspath $(top_builddir))
diff --git a/extensions/postgis_raster/Makefile.in b/extensions/postgis_raster/Makefile.in
index 64eec13be..1c118ccf0 100644
--- a/extensions/postgis_raster/Makefile.in
+++ b/extensions/postgis_raster/Makefile.in
@@ -134,5 +134,6 @@ PERL = @PERL@
 
 VPATH = @srcdir@
 
+top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 abs_topbuilddir=$(abspath $(top_builddir))
diff --git a/extensions/postgis_sfcgal/Makefile.in b/extensions/postgis_sfcgal/Makefile.in
index a1bf29b52..6acb88a6b 100644
--- a/extensions/postgis_sfcgal/Makefile.in
+++ b/extensions/postgis_sfcgal/Makefile.in
@@ -106,5 +106,6 @@ PERL = @PERL@
 
 VPATH = @srcdir@
 
+top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 abs_topbuilddir=$(abspath $(top_builddir))
diff --git a/extensions/postgis_tiger_geocoder/Makefile.in b/extensions/postgis_tiger_geocoder/Makefile.in
index efbc9fe30..aa291d3dc 100644
--- a/extensions/postgis_tiger_geocoder/Makefile.in
+++ b/extensions/postgis_tiger_geocoder/Makefile.in
@@ -217,5 +217,6 @@ PERL=@PERL@
 
 VPATH = @srcdir@
 
+top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 abs_topbuilddir=$(abspath $(top_builddir))
diff --git a/extensions/postgis_topology/Makefile.in b/extensions/postgis_topology/Makefile.in
index 3b4b684fc..e63f8f3d1 100644
--- a/extensions/postgis_topology/Makefile.in
+++ b/extensions/postgis_topology/Makefile.in
@@ -111,5 +111,6 @@ PERL=@PERL@
 
 VPATH = @srcdir@
 
+top_srcdir = @top_srcdir@
 top_builddir = @top_builddir@
 abs_topbuilddir=$(abspath $(top_builddir))
diff --git a/extensions/upgrade-paths-rules.mk b/extensions/upgrade-paths-rules.mk
index 3189960fb..b2af4966d 100644
--- a/extensions/upgrade-paths-rules.mk
+++ b/extensions/upgrade-paths-rules.mk
@@ -23,7 +23,7 @@ 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; \
-	$(abs_topbuilddir)/loader/postgis \
+	$(PERL) $(top_srcdir)/loader/postgis.pl \
 		install-extension-upgrades \
 		--extension $(EXTENSION) \
 		--pg_sharedir $(PG_SHAREDIR) \

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

Summary of changes:
 extensions/address_standardizer/Makefile.in   | 1 +
 extensions/postgis/Makefile.in                | 3 +++
 extensions/postgis_raster/Makefile.in         | 1 +
 extensions/postgis_sfcgal/Makefile.in         | 1 +
 extensions/postgis_tiger_geocoder/Makefile.in | 1 +
 extensions/postgis_topology/Makefile.in       | 1 +
 extensions/upgrade-paths-rules.mk             | 2 +-
 7 files changed, 9 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
PostGIS