From: Regina Obe Date: Sun, 14 Apr 2019 02:05:18 +0000 (+0000) Subject: Add sfcgal to path X-Git-Tag: 3.0.0alpha1~50 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=c0ccab25fbbf7088ad02c5aa73361cf89fa855a4;p=postgis Add sfcgal to path git-svn-id: http://svn.osgeo.org/postgis/trunk@17391 b70326c6-7e19-0410-871a-916f4a2858ee --- diff --git a/ci/debbie/postgis_regress.sh b/ci/debbie/postgis_regress.sh index 8170f416a..d89d4b843 100644 --- a/ci/debbie/postgis_regress.sh +++ b/ci/debbie/postgis_regress.sh @@ -23,7 +23,7 @@ PROJECTS=${JENKINS_HOME}/workspace PGPATH=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD} export PGUSER=postgres -export PATH="${PGPATH}/bin:$PATH" +export PATH="${PGPATH}/bin:${PROJECTS}/sfcgal/rel-${SFCGAL_VER}w${OS_BUILD}/bin:$PATH" export LD_LIBRARY_PATH="${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/lib:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/lib:${PROJECTS}/sfcgal/rel-${SFCGAL_VER}w${OS_BUILD}/lib:${PGPATH}/lib" rm -rf ${WORKSPACE}/tmp/${POSTGIS_MAJOR_VERSION}.${POSTGIS_MINOR_VERSION} @@ -64,7 +64,7 @@ fi --with-pgconfig=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD}/bin/pg_config \ --with-geosconfig=${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}/bin/geos-config \ --with-gdalconfig=${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}/bin/gdal-config \ - --with-sfcgal=/var/lib/jenkins/workspace/sfcgal/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}/bin/sfcgal-config --without-interrupt-tests \ + --with-sfcgal=${PROJECTS}/sfcgal/rel-sfcgal-${SFCGAL_VER}w${OS_BUILD}/bin/sfcgal-config --without-interrupt-tests \ --prefix=${PROJECTS}/pg/rel/pg${PG_VER}w${OS_BUILD} make clean make