Windows: make some vars in windows-makefile.tmpl reachable again

$openssldir and $enginesdir were mistakenly made unavailable to other
perl fragments.  They are still needed in the definition of CFLAGS.

Reviewed-by: Rich Salz <rsalz@openssl.org>

diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl
index 9b7bcabc6e711f234d7dd4ab878aa014e9a24241..c9a7a26f040628bcc4e2ffbc95cfc0dbc4b1614a 100644 (file)
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -107,7 +107,7 @@ OPENSSLDIR_dev={- #
                   # value appended as a subdirectory.
                   #
                   use File::Spec::Functions qw(:DEFAULT splitpath);
                   # value appended as a subdirectory.
                   #
                   use File::Spec::Functions qw(:DEFAULT splitpath);

-                  my $openssldir =
+                  our $openssldir =

                       $config{openssldir} ?
                           (file_name_is_absolute($config{openssldir}) ?
                                $config{openssldir}
                       $config{openssldir} ?
                           (file_name_is_absolute($config{openssldir}) ?
                                $config{openssldir}


@@ -120,7 +120,7 @@ OPENSSLDIR_dir={- $openssldir_dir -}
 LIBDIR={- our $libdir = $config{libdir} || "lib";
           $libdir -}
 ENGINESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath);
 LIBDIR={- our $libdir = $config{libdir} || "lib";
           $libdir -}
 ENGINESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath);

-                  my $enginesdir = catdir($prefix,$libdir,"engines-$sover");
+                  our $enginesdir = catdir($prefix,$libdir,"engines-$sover");

                   our ($enginesdir_dev, $enginesdir_dir, $enginesdir_file) =
                       splitpath($enginesdir, 1);
                   $enginesdir_dev -}
                   our ($enginesdir_dev, $enginesdir_dir, $enginesdir_file) =
                       splitpath($enginesdir, 1);
                   $enginesdir_dev -}