Commit 3ffb060e authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
parent 794ad952

Configurations/windows-makefile.tmpl

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