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/windows-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/windows-makefile.tmpl')
| -rw-r--r-- | Configurations/windows-makefile.tmpl | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index 6d38cfe15f..f327169c80 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -148,20 +148,33 @@ OPENSSLDIR_dev={- # OPENSSLDIR_dir={- canonpath($openssldir_dir) -} LIBDIR={- our $libdir = $config{libdir} || "lib"; file_name_is_absolute($libdir) ? "" : $libdir -} -ENGINESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath); - our $enginesdir = catdir($prefix,$libdir,"engines-$sover_dirname"); - our ($enginesdir_dev, $enginesdir_dir, $enginesdir_file) = - splitpath($enginesdir, 1); - $enginesdir_dev -} +MODULESDIR_dev={- use File::Spec::Functions qw(:DEFAULT splitpath); + our $modulesprefix = catdir($prefix,$libdir); + our ($modulesprefix_dev, $modulesprefix_dir, + $modulesprefix_file) = + splitpath($modulesprefix, 1); + our $modulesdir_dev = $modulesprefix_dev; + our $modulesdir_dir = + catdir($modulesprefix_dir, "ossl-modules"); + our $modulesdir = catpath($modulesdir_dev, $modulesdir_dir); + our $enginesdir_dev = $modulesprefix_dev; + out $enginesdir_dir = + catdir($modulesprefix_dir, "engines-$sover_dirname"); + our $enginesdir = catpath($enginesdir_dev, $enginesdir_dir); + $modulesdir_dev -} +MODULESDIR_dir={- canonpath($modulesdir_dir) -} +ENGINESDIR_dev={- $enginesdir_dev -} ENGINESDIR_dir={- canonpath($enginesdir_dir) -} !IF "$(DESTDIR)" != "" INSTALLTOP=$(DESTDIR)$(INSTALLTOP_dir) OPENSSLDIR=$(DESTDIR)$(OPENSSLDIR_dir) ENGINESDIR=$(DESTDIR)$(ENGINESDIR_dir) +MODULESDIR=$(DESTDIR)$(MODULESDIR_dir) !ELSE INSTALLTOP=$(INSTALLTOP_dev)$(INSTALLTOP_dir) OPENSSLDIR=$(OPENSSLDIR_dev)$(OPENSSLDIR_dir) ENGINESDIR=$(ENGINESDIR_dev)$(ENGINESDIR_dir) +MODULESDIR=$(MODULESDIR_dev)$(MODULESDIR_dir) !ENDIF # $(libdir) is chosen to be compatible with the GNU coding standards @@ -255,7 +268,8 @@ LIB_CPPFLAGS={- our $lib_cppflags = join(' ', $lib_cppflags, (map { '-D'.quotify1($_) } "OPENSSLDIR=\"$openssldir\"", - "ENGINESDIR=\"$enginesdir\""), + "ENGINESDIR=\"$enginesdir\"", + "MODULESDIR=\"$modulesdir\""), '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} LIB_CFLAGS={- join(' ', $target{lib_cflags} || (), $target{shared_cflag} || (), |