diff options
| author | Andy Polyakov <appro@openssl.org> | 2016-05-06 12:45:50 +0200 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2016-05-09 10:40:56 +0200 |
| commit | 9921b7b6a2b4cf8fc57213cf477275fc038fbfd1 (patch) | |
| tree | 3a8092f1e1f5b60c6d6ffb081862d2a33b2f9ccb /Configurations/windows-makefile.tmpl | |
| parent | dccd20d1b55d15afdc80ad987ff37023d323dc42 (diff) | |
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@openssl.org>
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 8 |
1 files 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}; |