copy libs into bin directory after running make distclean (#172)

OSGeo · Nov 4, 2019 · 39af5f5 · 39af5f5
1 parent ac92b9e
commit 39af5f5
Showing 1 changed file with 9 additions and 9 deletions.
diff --git a/mswindows/osgeo4w/package.sh b/mswindows/osgeo4w/package.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/bash
 
-# osgeo4w-setup -g -k -a x86_64 -q -P gdal proj geos fftw libjpeg liblas-devel libpng libpq libtiff libxdr pdcurses regex-devel sqlite3 zstd-devel zstd laszip2
+# osgeo4w-setup -g -k -a x86_64 -q -P gdal proj geos fftw libjpeg liblas-devel libpng libpq libtiff libxdr pdcurses regex-devel sqlite3 zstd-devel zstd laszip2 python3-core python3-six
 
 set -e
 
@@ -166,14 +166,6 @@ else
 	conf_opts=
 fi
 
-mkdir -p dist.$conf_host/bin
-cp -uv $DLLS dist.$conf_host/bin
-
-mkdir -p mswindows/osgeo4w/lib
-cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/pq.lib
-cp -uv $OSGEO4W_ROOT_MSYS/lib/proj_i.lib mswindows/osgeo4w/lib/proj.lib
-cp -uv $OSGEO4W_ROOT_MSYS/lib/sqlite3_i.lib mswindows/osgeo4w/lib/sqlite3.lib
-
 if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 	if [ -e include/Make/Platform.make ] ; then
 	    log make distclean
@@ -183,6 +175,14 @@ if ! [ -f mswindows/osgeo4w/configure-stamp ]; then
 	log remove old logs
 	rm -f mswindows/osgeo4w/package.log.*
 
+	mkdir -p dist.$conf_host/bin
+	cp -uv $DLLS dist.$conf_host/bin
+
+	mkdir -p mswindows/osgeo4w/lib
+	cp -uv $OSGEO4W_ROOT_MSYS/lib/libpq.lib mswindows/osgeo4w/lib/pq.lib
+	cp -uv $OSGEO4W_ROOT_MSYS/lib/proj_i.lib mswindows/osgeo4w/lib/proj.lib
+	cp -uv $OSGEO4W_ROOT_MSYS/lib/sqlite3_i.lib mswindows/osgeo4w/lib/sqlite3.lib
+
 	log configure
 	./configure \
 	        --host=$conf_host \