[openssl-commits] [openssl] master update
Andy Polyakov
appro at openssl.org
Mon May 9 08:41:38 UTC 2016
The branch master has been updated
via 9921b7b6a2b4cf8fc57213cf477275fc038fbfd1 (commit)
from dccd20d1b55d15afdc80ad987ff37023d323dc42 (commit)
- Log -----------------------------------------------------------------
commit 9921b7b6a2b4cf8fc57213cf477275fc038fbfd1
Author: Andy Polyakov <appro at openssl.org>
Date: Fri May 6 12:45:50 2016 +0200
Configurations/windows-makefile.tmpl: expand environments early.
If environment variables are not explanded early enough, expanded
strings are passed with single backslash to C compiler, e.g.
C:\Program Files, which effectively results in OpenSSL looking for
engines and certificates in C:Program Files.
Reviewed-by: Richard Levitte <levitte at openssl.org>
-----------------------------------------------------------------------
Summary of changes:
Configurations/windows-makefile.tmpl | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 159d57c..887b7a2 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -19,10 +19,14 @@
? "CommonProgramFiles(x86)" : "CommonProgramW6432";
our $win_installroot =
defined($ENV{$win_installenv})
- ? '%'.$win_installenv.'%' : '%ProgramFiles%';
+ ? $win_installenv : 'ProgramFiles';
our $win_commonroot =
defined($ENV{$win_commonenv})
- ? '%'.$win_commonenv.'%' : '%CommonProgramFiles%';
+ ? $win_commonenv : 'CommonProgramFiles';
+
+ # expand variables early
+ $win_installroot = $ENV{$win_installroot};
+ $win_commonroot = $ENV{$win_commonroot};
sub shlib {
return () if $disabled{shared};
More information about the openssl-commits
mailing list