Commit 9921b7b6 authored by Andy Polyakov's avatar Andy Polyakov
Browse files

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: default avatarRichard Levitte <levitte@openssl.org>
parent dccd20d1

Configurations/windows-makefile.tmpl

+6 −2
Original line number Diff line number Diff line
@@ -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};