Windows: make some vars in windows-makefile.tmpl reachable again
authorRichard Levitte <levitte@openssl.org>
Wed, 6 Jul 2016 17:43:59 +0000 (19:43 +0200)
committerRichard Levitte <levitte@openssl.org>
Thu, 7 Jul 2016 13:07:32 +0000 (15:07 +0200)
$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>
Configurations/windows-makefile.tmpl

index 9b7bcab..c9a7a26 100644 (file)
@@ -107,7 +107,7 @@ OPENSSLDIR_dev={- #
                   # 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}
@@ -120,7 +120,7 @@ OPENSSLDIR_dir={- $openssldir_dir -}
 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 -}