From 9921b7b6a2b4cf8fc57213cf477275fc038fbfd1 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Fri, 6 May 2016 12:45:50 +0200 Subject: [PATCH] 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 --- 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 159d57c931..887b7a2bea 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}; -- 2.25.1