[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-669-ge7ac8e1f8

[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  e7ac8e1f8a63cbc4af2eb0d3b815f7fac79eac6f (commit)
      from  9ea9b67580a3c0a5b562f1cd0922efba264e747a (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 e7ac8e1f8a63cbc4af2eb0d3b815f7fac79eac6f
Author: Sandro Santilli <strk at kbt.io>
Date:   Mon Feb 27 18:46:23 2023 +0100

    Drop use of PGXS from utils dir

diff --git a/utils/Makefile.in b/utils/Makefile.in
index 4dc63805a..a0b8be196 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -11,20 +11,17 @@
 # *
 # **********************************************************************
 
-# Separate PGXS-enabled Makefile for documentation installation (it is
-# not possible to merge into the main Makefile as has been done for
-# the shapefile loader)
-
-MODULE_doc=postgis- at POSTGIS_MAJOR_VERSION@. at POSTGIS_MINOR_VERSION@
-MODULEDIR=contrib/$(MODULE_doc)
-
-# Files to be copied to the contrib/ directory
-DATA_built=postgis_restore.pl
-
-# PGXS information
-PG_CONFIG := @PG_CONFIG@
-PGXS := @PGXS@
-include $(PGXS)
+top_builddir = @top_builddir@
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+datadir = @datadir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+bindir = @bindir@
+INSTALL=@INSTALL@
+INSTALL_DATA=@INSTALL_DATA@
+SRID_MAXIMUM = @SRID_MAX@
+SRID_USER_MAXIMUM = @SRID_USR_MAX@
 
 VPATH := @srcdir@
 
@@ -41,10 +38,7 @@ SCRIPTS = \
 	test_estimation.pl \
 	test_joinestimation.pl
 
-SRID_MAXIMUM = @SRID_MAX@
-SRID_USER_MAXIMUM = @SRID_USR_MAX@
-
-all: postgis_restore.pl
+all: $(SCRIPTS_built)
 
 DROP_FILES = \
   ../raster/rt_pg/rtpostgis_upgrade_cleanup.sql.in \
@@ -70,14 +64,25 @@ update-restore:
 	cat postgis_restore.pl.in | sed '/^__END__/q' > postgis_restore.pl.in.new
 	cat postgis_restore_data | sort -u >> postgis_restore.pl.in.new
 	mv postgis_restore.pl.in.new postgis_restore.pl.in
-	rm -f postgis_restore_data
 
 postgis_restore.pl: postgis_restore.pl.in
 	sed 's, at SRID_MAXIMUM@,$(SRID_MAXIMUM),g;s, at SRID_USER_MAXIMUM@,$(SRID_USER_MAXIMUM),' $< >$@
 	chmod +x $@
 
+clean:
+	rm -f $(SCRIPTS_built) postgis_restore_data
+
 distclean: clean
 	rm -f Makefile
 
 # And there's nothing to check
 check check-unit check-regress:
+
+installdir:
+	@mkdir -p $(DESTDIR)$(bindir)
+
+uninstall:
+	rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(SCRIPTS_built))
+
+install: installdir $(SCRIPTS_built)
+	$(INSTALL) $(SCRIPTS_built) '$(DESTDIR)$(bindir)/'

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

Summary of changes:
 utils/Makefile.in | 43 ++++++++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 19 deletions(-)


hooks/post-receive
-- 
PostGIS