[postgis-tickets] r16873 - fix windows packaging

[Regina Obe]

Author: robe
Date: 2018-10-02 20:38:17 -0700 (Tue, 02 Oct 2018)
New Revision: 16873

Modified:
   trunk/ci/winnie/package_postgis.sh
Log:
fix windows packaging

Modified: trunk/ci/winnie/package_postgis.sh
===================================================================
--- trunk/ci/winnie/package_postgis.sh	2018-10-03 03:28:08 UTC (rev 16872)
+++ trunk/ci/winnie/package_postgis.sh	2018-10-03 03:38:17 UTC (rev 16873)
@@ -77,7 +77,7 @@
 
 
 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 @@
 
 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