[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-396-g140cae87a

[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  140cae87ad9689f31c8b70b00c1740d93a08d8f1 (commit)
      from  255967001520931f2e82cff25060a8dec07112b9 (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 140cae87ad9689f31c8b70b00c1740d93a08d8f1
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed Dec 14 18:52:30 2022 +0100

    Honour --mandir (and --prefix) configure switch for man pages

diff --git a/NEWS b/NEWS
index 89c794743..87a36be18 100644
--- a/NEWS
+++ b/NEWS
@@ -16,6 +16,7 @@ xxxx/xx/xx
   - #5194, do not update system catalogs from postgis_extensions_upgrade (Sandro Santilli)
   - #5092, reduce number of upgrade paths installed on system (Sandro Santilli)
   - #635, honour --bindir (and --prefix) configure switch for executables (Sandro Santilli)
+  - Honour --mandir (and --prefix) configure switch for man pages install path (Sandro Santilli)
 
 * Bug Fix *
 
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 1ecfaf020..8175fb5c8 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -27,6 +27,7 @@ srcdir = @srcdir@
 top_srcdir = @top_srcdir@
 builddir = @builddir@
 top_builddir = @top_builddir@
+mandir = @mandir@
 
 POSTGIS_MAJOR_VERSION=@POSTGIS_MAJOR_VERSION@
 POSTGIS_MINOR_VERSION=@POSTGIS_MINOR_VERSION@
@@ -97,7 +98,6 @@ DBTOEPUB=dbtoepub
 
 # Directories for postgresql subdirectories
 PGSQL_DOCDIR=@PGSQL_DOCDIR@
-PGSQL_MANDIR=@PGSQL_MANDIR@
 PGSQL_SHAREDIR=@PGSQL_SHAREDIR@
 
 BUILD_TARGET =
@@ -392,16 +392,16 @@ comments-uninstall:
 	$(MAKE) -f Makefile.comments uninstall
 
 man-install: man/shp2pgsql.1 man/pgsql2shp.1 man/pgtopo_export.1 man/pgtopo_import.1
-	mkdir -p $(DESTDIR)$(PGSQL_MANDIR)/man1
+	mkdir -p $(DESTDIR)$(mandir)/man1
 	for f in $^; do \
-		$(INSTALL_DATA) $$f $(DESTDIR)$(PGSQL_MANDIR)/man1/`basename $$f`; \
+		$(INSTALL_DATA) $$f $(DESTDIR)$(mandir)/man1/`basename $$f`; \
 	done
 
 man-uninstall:
-	rm -f $(DESTDIR)$(PGSQL_MANDIR)/man1/shp2pgsql.1
-	rm -f $(DESTDIR)$(PGSQL_MANDIR)/man1/pgsql2shp.1
-	rm -f $(DESTDIR)$(PGSQL_MANDIR)/man1/pgtopo_export.1
-	rm -f $(DESTDIR)$(PGSQL_MANDIR)/man1/pgtopo_import.1
+	rm -f $(DESTDIR)$(mandir)/man1/shp2pgsql.1
+	rm -f $(DESTDIR)$(mandir)/man1/pgsql2shp.1
+	rm -f $(DESTDIR)$(mandir)/man1/pgtopo_export.1
+	rm -f $(DESTDIR)$(mandir)/man1/pgtopo_import.1
 
 docs-install: html/postgis.html html/style.css
 	mkdir -p $(DESTDIR)$(PGSQL_DOCDIR)/postgis/images

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

Summary of changes:
 NEWS            |  1 +
 doc/Makefile.in | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
PostGIS