diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-10 18:51:15 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-10 19:36:48 +0100 |
| commit | e09621ff57f6965d30cc2d6b5045f93906d656a0 (patch) | |
| tree | 8dcd17b8487b8fadf7a7ed5a66c14611e26b4692 /util/mk1mf.pl | |
| parent | 9cc55ddda5bbfde2e98fb94f312b960ab11a8c60 (diff) | |
Make it possible to get ENGINESDIR info from OpenSSL_versions
Have apps/openssl display the result along with OPENSSLDIR
As part of this, add ENGINESDIR in util/mk1mf.pl
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'util/mk1mf.pl')
| -rwxr-xr-x | util/mk1mf.pl | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 1e72b9003b..e79733d710 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -11,6 +11,7 @@ use Cwd; $INSTALLTOP="/usr/local"; $OPENSSLDIR="/usr/local/ssl"; +$ENGINESDIR="/usr/local/lib/engines"; $OPTIONS=""; $ssl_version=""; $banner="\t\@echo Building OpenSSL"; @@ -47,6 +48,7 @@ my %mf_import = ( OPTIONS => \$OPTIONS, INSTALLTOP => \$INSTALLTOP, OPENSSLDIR => \$OPENSSLDIR, + ENGINESDIR => \$ENGINESDIR, PLATFORM => \$mf_platform, CC => \$mf_cc, CFLAG => \$mf_cflag, @@ -636,6 +638,7 @@ $defs .= $preamble if defined $preamble; $defs.= <<"EOF"; INSTALLTOP=$INSTALLTOP OPENSSLDIR=$OPENSSLDIR +ENGINESDIR=$ENGINESDIR # Set your compiler options PLATFORM=$platform @@ -770,6 +773,7 @@ install: all \$(MKDIR) \"\$(INSTALLTOP)${o}include\" \$(MKDIR) \"\$(INSTALLTOP)${o}include${o}openssl\" \$(MKDIR) \"\$(INSTALLTOP)${o}lib\" + \$(MKDIR) \"\$(INSTALLTOP)${o}lib${o}engines\" $extra_install clean: |