diff options
| author | Richard Levitte <levitte@openssl.org> | 2019-02-05 23:18:50 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2019-03-11 20:40:12 +0100 |
| commit | 3f4e8d6604842db4f416d029e9bbeddf90976c00 (patch) | |
| tree | ccf18fa2081dbd910a87dffdb839ed06205813a7 /Configurations/unix-Makefile.tmpl | |
| parent | 98f29466dc1ed7f80b9b8750309a41b5a1150d25 (diff) | |
Replumbing: Add MODULESDIR macro and OPENSSL_MODULES environment variable
These will be used to point out general OpenSSL modules directory.
ENGINE modules are kept apart for backward compatibility.
Reviewed-by: Matt Caswell <matt@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/8287)
Diffstat (limited to 'Configurations/unix-Makefile.tmpl')
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index dfae9afd0e..2561c47391 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -142,6 +142,7 @@ LIBDIR={- our $libdir = $config{libdir}; libdir={- file_name_is_absolute($libdir) ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -} ENGINESDIR=$(libdir)/engines-{- $sover_dirname -} +MODULESDIR=$(libdir)/ossl-modules # Convenience variable for those who want to set the rpath in shared # libraries and applications @@ -238,7 +239,8 @@ LIB_CPPFLAGS={- our $lib_cppflags = join(' ', $lib_cppflags, (map { '-D'.$_ } 'OPENSSLDIR="\"$(OPENSSLDIR)\""', - 'ENGINESDIR="\"$(ENGINESDIR)\""'), + 'ENGINESDIR="\"$(ENGINESDIR)\""', + 'MODULESDIR="\"$(MODULESDIR)\""'), '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} LIB_CFLAGS={- join(' ', $target{lib_cflags} || (), $target{shared_cflag} || (), |