From: Regina Obe <lr@pcorp.us>
Date: Wed, 3 Oct 2018 03:38:17 +0000 (+0000)
Subject: fix windows packaging
X-Git-Tag: 3.0.0alpha1~370
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=f9112f87c306ed66d6675e6888611d4c5749e5cc;p=postgis

fix windows packaging

git-svn-id: http://svn.osgeo.org/postgis/trunk@16873 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/ci/winnie/package_postgis.sh b/ci/winnie/package_postgis.sh
index 782b8f8ab..e6abcf553 100644
--- a/ci/winnie/package_postgis.sh
+++ b/ci/winnie/package_postgis.sh
@@ -77,7 +77,7 @@ export REL_PGVER=${PG_VER//./} #strip the period
 
 
 export RELDIR=${PROJECTS}/postgis/builds/${POSTGIS_MINOR_VER}
-export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MINOR_VER}.${POSTGIS_MICRO_VER}w${OS_BUILD}${GCC_TYPE}
+export RELVERDIR=postgis-pg${REL_PGVER}-binaries-${POSTGIS_MICRO_VER}w${OS_BUILD}${GCC_TYPE}
 export PATH="${PATHOLD}:${PGPATH}/bin:${PGPATH}/lib"
 export PCRE_VER=8.33 #PATH="${PGPATH}/bin:${PGPATH}/lib:${MINGPROJECTS}/xsltproc:${MINGPROJECTS}/gtkw${OS_BUILD}${GCC_TYPE}/bin:${PROJECTS}/gtkw${OS_BUILD}/bin:${PROJECTS}/geos/rel-${GEOS_VER}w${OS_BUILD}${GCC_TYPE}/bin:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/include:${MINGPROJECTS}/rel-libiconv-1.13.1w${OS_BUILD}${GCC_TYPE}/bin:${PATH}"
 #echo PATH AFTER: $PATH
@@ -135,7 +135,7 @@ cp ${PROJECTS}/protobuf/rel-${PROTOBUF_VER}w${OS_BUILD}${GCC_TYPE}/bin/libprotob
 
 echo "POSTGIS: ${POSTGIS_MINOR_VER} r${POSTGIS_SVN_REVISION} http://postgis.net/source" > $verfile
 
-if [ "$POSTGIS_MAJOR_VERSION" == "2" ] ; then
+if [ "$POSTGIS_MAJOR_VERSION" > "1" ] ; then
   ## only copy gdal components if 2+.  1.5 doesn't have raster support
   cp -p ${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/bin/*.dll $outdir/bin
   cp -rp  ${PROJECTS}/gdal/rel-${GDAL_VER}w${OS_BUILD}${GCC_TYPE}/share/gdal $outdir/gdal-data