[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-287-g0415ccb6d

[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  0415ccb6da8a8b313302c874cff2359e596fd982 (commit)
      from  8a73d5ee4ea69f318deda4ad3f72ee4cb5f20371 (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 0415ccb6da8a8b313302c874cff2359e596fd982
Author: Regina Obe <lr at pcorp.us>
Date:   Wed Oct 26 22:05:41 2022 -0400

    More cleanup of berrie64 script
    Change berries to use --prefix so they don't install shp2pgsql/pgsql2shp
    in system location
    Closes #5269 for PostGIS 3.4.0

diff --git a/ci/berrie/postgis_regress.sh b/ci/berrie/postgis_regress.sh
index 8735fc966..91923bb81 100644
--- a/ci/berrie/postgis_regress.sh
+++ b/ci/berrie/postgis_regress.sh
@@ -17,7 +17,7 @@ sh autogen.sh
 ./configure --with-pgconfig=${PGPATH}/bin/pg_config \
   --with-geosconfig=${GEOS_PATH}/bin/geos-config \
 	--without-protobuf --with-library-minor-version \
-	--enable-lto
+	--enable-lto --prefix=${PGPATH}/bin
 #make clean
 make
 export err_status=0
diff --git a/ci/berrie64/postgis_regress.sh b/ci/berrie64/postgis_regress.sh
index 2faa15a47..2ce9acbc6 100644
--- a/ci/berrie64/postgis_regress.sh
+++ b/ci/berrie64/postgis_regress.sh
@@ -16,7 +16,7 @@ echo $PATH
 cd ${WORKSPACE}/PostGIS_Worker_Run/label/${label}/$BRANCH
 
 sh autogen.sh
-./configure --with-pgconfig=${PGPATH}/bin/pg_config --with-geosconfig=${GEOS_PATH}/bin/geos-config --with-library-minor-version --enable-lto
+./configure --with-pgconfig=${PGPATH}/bin/pg_config --with-geosconfig=${GEOS_PATH}/bin/geos-config --with-library-minor-version --enable-lto --prefix=${PGPATH}/bin
 #make clean
 make
 export err_status=0
@@ -31,10 +31,8 @@ err_status=$?
 
 utils/check_all_upgrades.sh \
     `grep '^POSTGIS_' Version.config | cut -d= -f2 | paste -sd '.'`
- if [ "$?" != "0" ]; then
-   err_status=$?
- fi
 
+err_status=$?
 
 if [ -d $PGDATA/postmaster.pid ] ; then
 	$PGCTL stop -D $PGDATA -s -m fast

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

Summary of changes:
 ci/berrie/postgis_regress.sh   | 2 +-
 ci/berrie64/postgis_regress.sh | 6 ++----
 2 files changed, 3 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
PostGIS