The branch master has been updated
via 0685b15a68db1cd24678432f38b88f217495cbb9 (commit)
from c0c9c0c026d9676c9ebb6f5b0b900b8c3fac6673 (commit)
- Log -----------------------------------------------------------------
commit 0685b15a68db1cd24678432f38b88f217495cbb9
Author: Richard Levitte <[email protected]>
Date: Thu Jun 30 00:10:21 2016 +0200
Windows: Recreate the $prefix variable
$prefix was removed as part of the DESTDIR work. However, it was
still used to create the ENGINESDIR_dev and ENGINESDIR_dir variables,
so a restoration is needed.
Reviewed-by: Rich Salz <[email protected]>
-----------------------------------------------------------------------
Summary of changes:
Configurations/windows-makefile.tmpl | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/Configurations/windows-makefile.tmpl
b/Configurations/windows-makefile.tmpl
index b2e6cf5..fa430b6 100644
--- a/Configurations/windows-makefile.tmpl
+++ b/Configurations/windows-makefile.tmpl
@@ -90,9 +90,9 @@ GENERATED={- join(" ",
INSTALLTOP_dev={- # $prefix is used in the OPENSSLDIR perl snippet
#
use File::Spec::Functions qw(:DEFAULT splitpath);
+ our $prefix = $config{prefix} || "$win_installroot\\OpenSSL";
our ($prefix_dev, $prefix_dir, $prefix_file) =
- splitpath($config{prefix} || "$win_installroot\\OpenSSL",
- 1);
+ splitpath($prefix, 1);
$prefix_dev -}
INSTALLTOP_dir={- $prefix_dir -}
OPENSSLDIR_dev={- #
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
