aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSteve Holme <steve_holme@hotmail.com>2016-03-05 21:04:43 +0000
committerSteve Holme <steve_holme@hotmail.com>2016-03-05 21:40:53 +0000
commit1eae114065aa10a1011df5dbedcfc197ff60e6be (patch)
treef9e77364090c7994469256b7396a54129a950bfc
parent0ad6c7222799e32586fec6c2f061a0c82540b304 (diff)
build-openssl.bat: Fixed cannot find perl if installed but not in path
-rw-r--r--projects/build-openssl.bat15
1 files changed, 11 insertions, 4 deletions
diff --git a/projects/build-openssl.bat b/projects/build-openssl.bat
index 205b0c321..9081b46b2 100644
--- a/projects/build-openssl.bat
+++ b/projects/build-openssl.bat
@@ -6,7 +6,7 @@ rem * / __| | | | |_) | |
rem * | (__| |_| | _ <| |___
rem * \___|\___/|_| \_\_____|
rem *
-rem * Copyright (C) 2012 - 2015, Steve Holme, <steve_holme@hotmail.com>.
+rem * Copyright (C) 2012 - 2016, Steve Holme, <steve_holme@hotmail.com>.
rem *
rem * This software is licensed as described in the file COPYING, which
rem * you should have received as part of this distribution. The terms
@@ -120,11 +120,18 @@ rem ***************************************************************************
rem Check we have Visual Studio installed
if not exist "%PF%\%VC_PATH%" goto novc
- rem Check we have Perl installed
+ rem Check we have Perl in our path
echo %PATH% | findstr /I /C:"\Perl" 1>nul
if errorlevel 1 (
- if not exist "%SystemDrive%\Perl" (
- if not exist "%SystemDrive%\Perl64" goto noperl
+ rem It isn't so check we have it installed and set the path if it is
+ if exist "%SystemDrive%\Perl" (
+ set "PATH=%PATH%;%SystemDrive%\Perl\bin"
+ ) else (
+ if exist "%SystemDrive%\Perl64" (
+ set "PATH=%SystemDrive%\Perl64\bin;%PATH%"
+ ) else (
+ goto noperl
+ )
)
)