[postgis-tickets] [SCM] PostGIS branch master updated. 3.3.0rc2-744-g04b747974

[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  04b747974e2d0c35a568281edf6e3f61bf329cbf (commit)
      from  bc1f2c1f2df3de04881f86eaca2c26d2be33f783 (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 04b747974e2d0c35a568281edf6e3f61bf329cbf
Author: Regina Obe <lr at pcorp.us>
Date:   Wed Apr 26 01:27:27 2023 -0400

    Fix proj path

diff --git a/ci/winnie/regress_postgis.sh b/ci/winnie/regress_postgis.sh
index a7a506eda..87fa159eb 100644
--- a/ci/winnie/regress_postgis.sh
+++ b/ci/winnie/regress_postgis.sh
@@ -105,7 +105,11 @@ export SHLIB_LINK="-static-libstdc++ -lstdc++ -Wl,-Bdynamic -lm"
 CPPFLAGS="-I${PGPATH}/include -I${PROJECTS}/rel-libiconv-${ICON_VER}w${OS_BUILD}${GCC_TYPE}/include"
 
 #needed for proj.db to be found during cunit - for some reason on winnie it doesn't set
+if [ -d "${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/share/proj" ]; then
 export PROJ_LIB=${PROJECTS}/proj/rel-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/share/proj
+else
+export PROJ_LIB=${PROJECTS}/proj/rel-proj-${PROJ_VER}w${OS_BUILD}${GCC_TYPE}/share/proj
+fi
 
 #add protobuf
 export PATH="${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/lib:${PATH}"

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

Summary of changes:
 ci/winnie/regress_postgis.sh | 4 ++++
 1 file changed, 4 insertions(+)


hooks/post-receive
-- 
PostGIS