diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-07-06 19:43:59 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-07-07 15:07:32 +0200 |
| commit | 3ffb060ee2ca13992d356a9a61c153fb82e8088e (patch) | |
| tree | 3bfa0f514b82b6ad6ffaa91c96e31b55cf0dcb66 /Configurations | |
| parent | 794ad95269589ef7617f98925b6d521ab0d5b0f7 (diff) | |
| download | openssl-3ffb060ee2ca13992d356a9a61c153fb82e8088e.tar.gz | |
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>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 9b7bcabc6e..c9a7a26f04 100644 --- 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); - 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 -} |