[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-286-g8a73d5ee4

[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  8a73d5ee4ea69f318deda4ad3f72ee4cb5f20371 (commit)
       via  b1945bd6875188deb98b6c6e489b6e0a0621f9e4 (commit)
      from  e20fba16d8c21eb092dae96bd3fca6a006ad4b48 (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 8a73d5ee4ea69f318deda4ad3f72ee4cb5f20371
Author: Sandro Santilli <strk at kbt.io>
Date:   Wed May 25 10:48:46 2022 +0200

    Honour --prefix (and drop PGXS) for loader/dumper
    
    References #635

diff --git a/NEWS b/NEWS
index 065b0c536..f2e430462 100644
--- a/NEWS
+++ b/NEWS
@@ -12,6 +12,7 @@ xxxx/xx/xx
 * Enhancements *
   - #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)
 
 * Bug Fix *
 
diff --git a/loader/Makefile.in b/loader/Makefile.in
index da7aab7a1..b19dda54f 100644
--- a/loader/Makefile.in
+++ b/loader/Makefile.in
@@ -4,31 +4,25 @@
 # * http://postgis.net
 # *
 # * Copyright 2008 Mark Cave-Ayland
-# * Copyright (c) 2020 Sandro Santilli <strk at kbt.io>
+# * Copyright (c) 2020-2022 Sandro Santilli <strk at kbt.io>
 # *
 # * This is free software; you can redistribute and/or modify it under
 # * the terms of the GNU General Public Licence. See the COPYING file.
 # *
 # **********************************************************************
 
-# PGXS information
-#
-# Note that PGXS currently doesn't handle building FE executables, but we need
-# the DESTDIR variable so we can get the correct install paths.
-# Hence we include the PGXS Makefile here, but ensure that we override the
-# 'all' and 'install' targets with the ones we really want to use below.
-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@
 
 VPATH = $(srcdir)
 
-# Set CFLAGS afer PGXS, otherwise it will get overwritten with the PGXS
-# version which is not what we want.
 CC=@CC@
 CFLAGS= -I$(top_srcdir)/liblwgeom -I$(top_builddir)/liblwgeom @CPPFLAGS@ @CFLAGS@ @PICFLAGS@ @PROJ_CPPFLAGS@
 SHELL = @SHELL@
@@ -72,6 +66,9 @@ CFLAGS += $(GETTEXT_CFLAGS) $(ICONV_CFLAGS)
 # If REGRESS=1 passed as a parameter, change the default install paths
 # so that no prefix is included. This allows us to relocate to a temporary
 # directory for regression testing.
+#
+# TODO: rely on DESTDIR instead
+#
 ifeq ($(REGRESS),1)
 	bindir=/bin
 	pkglibdir=/lib

commit b1945bd6875188deb98b6c6e489b6e0a0621f9e4
Author: Sandro Santilli <strk at kbt.io>
Date:   Tue Oct 25 12:03:58 2022 +0200

    define _GNU_SOURCE for proper use of vasprintf

diff --git a/loader/pgsql2shp-core.c b/loader/pgsql2shp-core.c
index b3a16dc0c..b6bd1d67a 100644
--- a/loader/pgsql2shp-core.c
+++ b/loader/pgsql2shp-core.c
@@ -21,6 +21,9 @@
 
 #include "../postgis_config.h"
 
+#define _GNU_SOURCE /* for vasprintf */
+#include <stdio.h>
+
 #include "pgsql2shp-core.h"
 
 /* Solaris9 does not provide stdint.h */

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

Summary of changes:
 NEWS                    |  1 +
 loader/Makefile.in      | 23 ++++++++++-------------
 loader/pgsql2shp-core.c |  3 +++
 3 files changed, 14 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
PostGIS