[cpp-msbuild] 03/13: SPCPP-765 Parameterize the location of PERL

[Rod Widdowson]

This is an automated email from the git hooks/post-receive script.

rdw pushed a commit to branch master
in repository cpp-msbuild.

View the commit online:
http://git.shibboleth.net/view/?p=cpp-msbuild.git;a=commit;h=c59bdb697237cd6b1ba48ab5653955dbf9f3133c

commit c59bdb697237cd6b1ba48ab5653955dbf9f3133c
Author: Rod Widdowson <rdw at steadingsoftware.com>
AuthorDate: Tue Dec 5 10:34:18 2017 +0000

    SPCPP-765 Parameterize the location of PERL
    
    https://issues.shibboleth.net/jira/browse/SSPCPP-765
---
 dependencies/dependency.make | 4 ++--
 env.make                     | 4 +++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/dependencies/dependency.make b/dependencies/dependency.make
index 0d9c9f9..03c3a3b 100644
--- a/dependencies/dependency.make
+++ b/dependencies/dependency.make
@@ -216,12 +216,12 @@ $(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug\include\openssl\opensslcon
 openssl-release-configure: openssl-test $(ROOT_DIR)\$(OPENSSL_DIR)\Configure
 	title Build OpenSSL $(VSCMD_ARG_TGT_ARCH) Release
 	cd $(ROOT_DIR)\$(OPENSSL_DIR)
-	perl Configure VC-$(OpenSSLName) --prefix=$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)
+	$(PERL) Configure VC-$(OpenSSLName) --prefix=$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)
 
 openssl-debug-configure: openssl-test $(ROOT_DIR)\$(OPENSSL_DIR)\ConfigureD
 	title Build OpenSSL $(VSCMD_ARG_TGT_ARCH) Debug
 	cd $(ROOT_DIR)\$(OPENSSL_DIR)
-	perl ConfigureD debug-VC-$(OpenSSLName) --prefix=$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug
+	$(PERL) ConfigureD debug-VC-$(OpenSSLName) --prefix=$(ROOT_DIR)\$(OPENSSL_DIR)\$(VSCMD_ARG_TGT_ARCH)Debug
 
 openssl-build: $(ROOT_DIR)\$(OPENSSL_DIR)\makefile
 	cd $(ROOT_DIR)\$(OPENSSL_DIR)
diff --git a/env.make b/env.make
index c32020c..87642c0 100644
--- a/env.make
+++ b/env.make
@@ -6,7 +6,9 @@
 !error ROOT_DIR not defined
 !endif
 
-
+!if "$(PERL)" == ""
+PERL=perl
+!endif
 
 !if "$(SED)" == ""
 SED=sed

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.