mirrors/openssl
0
0
Fork 0
mirror of https://github.com/openssl/openssl.git synced 2024-12-21 07:53:57 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
$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>
This commit is contained in:
Richard Levitte 2016-07-06 19:43:59 +02:00
parent 794ad95269
commit 3ffb060ee2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Configurations/windows-makefile.tmpl
View File

@ -107,7 +107,7 @@ OPENSSLDIR_dev={- #
# value appended as a subdirectory. # value appended as a subdirectory.
# #
use File::Spec::Functions qw(:DEFAULT splitpath); use File::Spec::Functions qw(:DEFAULT splitpath);
my $openssldir = our $openssldir =
$config{openssldir} ? $config{openssldir} ?
(file_name_is_absolute($config{openssldir}) ? (file_name_is_absolute($config{openssldir}) ?
$config{openssldir} $config{openssldir}
@ -120,7 +120,7 @@ OPENSSLDIR_dir={- $openssldir_dir -}
LIBDIR={- our $libdir = $config{libdir} || "lib"; LIBDIR={- our $libdir = $config{libdir} || "lib";
$libdir -} $libdir -}
ENGINESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath); 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) = our ($enginesdir_dev, $enginesdir_dir, $enginesdir_file) =
splitpath($enginesdir, 1); splitpath($enginesdir, 1);
$enginesdir_dev -} $enginesdir_dev -}