Fix libssh2 build for deep workspace

dmpgpro · dmpgpro · commit 9208b90462b9 · 2018-05-15T16:31:04.000+03:00
diff --git a/build/helpers/dependencies.cmd b/build/helpers/dependencies.cmd
@@ -253,11 +253,11 @@ CD /D %DOWNLOADS_DIR%
 TITLE Building libssh2...
 CD /D %DOWNLOADS_DIR%
 wget --no-check-certificate -c http://www.libssh2.org/download/libssh2-%LIBSSH2_VER%.tar.gz -O libssh2-%LIBSSH2_VER%.tar.gz
-rm -rf %DEPENDENCIES_BIN_DIR%\libssh2 %DEPENDENCIES_SRC_DIR%/libssh2-*
+rm -rf %DEPENDENCIES_BIN_UDIR%/libssh2 %DEPENDENCIES_SRC_UDIR%/libssh2-*
 MKDIR %DEPENDENCIES_BIN_DIR%\libssh2
 tar xf libssh2-%LIBSSH2_VER%.tar.gz -C %DEPENDENCIES_SRC_UDIR% || GOTO :ERROR
-cp -va %DEPENDENCIES_SRC_DIR%/libssh2-*/include %DEPENDENCIES_BIN_DIR%\libssh2\include  || GOTO :ERROR
-cp -va %DEPENDENCIES_SRC_DIR%/libssh2-*/win32/libssh2_config.h %DEPENDENCIES_BIN_DIR%\libssh2\include  || GOTO :ERROR
+cp -va %DEPENDENCIES_SRC_UDIR%/libssh2-*/include %DEPENDENCIES_BIN_UDIR%/libssh2/include  || GOTO :ERROR
+cp -va %DEPENDENCIES_SRC_UDIR%/libssh2-*/win32/libssh2_config.h %DEPENDENCIES_BIN_UDIR%/libssh2/include  || GOTO :ERROR
 CD /D %DOWNLOADS_DIR%
 7z a -r %DOWNLOADS_DIR%\%DEPS_ZIP% %DEPENDENCIES_BIN_DIR%\libssh2 -y
 
diff --git a/build/helpers/setvars.cmd b/build/helpers/setvars.cmd
@@ -85,6 +85,7 @@ SET DOWNLOADS_DIR=%BUILD_DIR%\downloads
 REM Convert paths for Unix utilites
 SET BUILD_UDIR=%BUILD_DIR:\=/%
 SET DEPENDENCIES_SRC_UDIR=%DEPENDENCIES_SRC_DIR:\=/%
+SET DEPENDENCIES_BIN_UDIR=%DEPENDENCIES_BIN_DIR:\=/%
 
 REM Magic to set root directory of those scripts (Where Readme.md lies)
 
