From d2799bd41bacaa99b85ee5a905eedb65537d897d Mon Sep 17 00:00:00 2001
From: Joerg Koenig <Joerg.Koenig@techsat.com>
Date: Mon, 13 May 2019 15:12:49 +0200
Subject: Fixed working directories

Change-Id: I09ee1b0e7021adf7dc86143f84ca00e2a5df5c3f
---
 buildqt32.bat | 8 +++++---
 buildqt64.bat | 8 +++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/buildqt32.bat b/buildqt32.bat
index 67d5cde..52fddf8 100755
--- a/buildqt32.bat
+++ b/buildqt32.bat
@@ -7,7 +7,7 @@ if not defined SDKDIR (
     exit /b 1
 )
 if not defined PERLDIR (
-    echo SDKDIR is not defined.
+    echo PERLDIR is not defined.
     exit /b 1
 )
 rem SET SDKDIR=z:\VS2019BT\
@@ -16,6 +16,8 @@ rem SET PERLDIR=z:\Perl64\
 SET QT_VERSION=5.12
 SET QT_RELEASE=3
 
+SET PERL=%PERLDIR%\perl.exe
+
 SET QT_FULL_VER=%QT_VERSION%.%QT_RELEASE%
 SET QT_SOURCE_ARCHIVE=qt-everywhere-src-%QT_FULL_VER%.zip
 SET "DL_URL=https://download.qt.io/official_releases/qt/%QT_VERSION%/%QT_FULL_VER%/single/%QT_SOURCE_ARCHIVE%"
@@ -35,14 +37,14 @@ call %SDKDIR%setvcvars.bat 2019 x86
 
 rem Build OpenSSL
 cd %BASEDIR%\%OPENSSL%
-call perl Configure VC-WIN32 --prefix=%BASEDIR%/openssl-%INST_ARCH%
+call %PERL% Configure VC-WIN32 --prefix=%BASEDIR%/openssl-%INST_ARCH%
 call ms\do_ms.bat
 call ms\do_nasm.bat
 rem Build static lib
 call nmake -f ms\nt.mak
 call nmake -f ms\nt.mak install
 rem Build DLL
-call perl Configure VC-WIN32 --prefix=%BASEDIR%/openssl-%INST_ARCH%
+call %PERL% Configure VC-WIN32 --prefix=%BASEDIR%/openssl-%INST_ARCH%
 call ms\do_ms.bat
 call ms\do_nasm.bat
 call nmake -f ms\ntdll.mak
diff --git a/buildqt64.bat b/buildqt64.bat
index 87c8313..cad3e06 100755
--- a/buildqt64.bat
+++ b/buildqt64.bat
@@ -7,10 +7,12 @@ IF NOT DEFINED SDKDIR (
     EXIT /b 1
 )
 IF NOT DEFINED PERLDIR (
-    ECHO SDKDIR is not defined.
+    ECHO PERLDIR is not defined.
     EXIT /b 1
 )
 
+set PERL=%PERLDIR%\perl.exe
+
 REM SET SDKDIR=z:\VS2019BT
 REM SET PERLDIR=z:\Perl64
 
@@ -36,13 +38,13 @@ call "%SDKDIR%\setvcvars.bat" 2019 x64
 
 rem - static - 
 cd %OPENSSL%
-call perl Configure VC-WIN64A --prefix=%BASEDIR%openssl-%INST_ARCH%
+call %PERL% Configure VC-WIN64A --prefix=%BASEDIR%openssl-%INST_ARCH%
 call ms\do_win64a
 call nmake -f ms\nt.mak
 call nmake -f ms\nt.mak install
 rem - shared - 
 cd %OPENSSL%
-call perl Configure VC-WIN64A --prefix=%BASEDIR%openssl-%INST_ARCH%
+call %PERL% Configure VC-WIN64A --prefix=%BASEDIR%openssl-%INST_ARCH%
 call ms\do_win64a
 call nmake -f ms\ntdll.mak
 call nmake -f ms\ntdll.mak install
-- 
cgit v0.12