From: Andy Polyakov <appro@openssl.org>
Date: Fri, 6 May 2016 10:45:50 +0000 (+0200)
Subject: Configurations/windows-makefile.tmpl: expand environments early.
X-Git-Tag: OpenSSL_1_1_0-pre6~899
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=9921b7b6a2b4cf8fc57213cf477275fc038fbfd1

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>
---

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};