[openssl-commits] [openssl] master update
Richard Levitte
levitte at openssl.org
Mon Nov 19 09:56:03 UTC 2018
The branch master has been updated
via 9694ebf753e571a55935a63b4df8016e7bd3248d (commit)
from 6dfcea3dfb167ccf37907601a3be6dc50f9c213b (commit)
- Log -----------------------------------------------------------------
commit 9694ebf753e571a55935a63b4df8016e7bd3248d
Author: Richard Levitte <levitte at openssl.org>
Date: Mon Nov 19 10:21:49 2018 +0100
Unix build: for mingw and cygwin, create the right location for DLLs
Mingw and Cygwin builds install the DLLs in the application directory,
not the library directory, so ensure that one is created for them when
installing the DLLs.
Fixes #7653
Reviewed-by: Tim Hudson <tjh at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7654)
-----------------------------------------------------------------------
Summary of changes:
Configurations/unix-Makefile.tmpl | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl
index 8b4b6fe..c64c154 100644
--- a/Configurations/unix-Makefile.tmpl
+++ b/Configurations/unix-Makefile.tmpl
@@ -644,7 +644,9 @@ install_runtime_libs: build_libs
@[ -n "$(INSTALLTOP)" ] || (echo INSTALLTOP should not be empty; exit 1)
@ : {- output_off() if windowsdll(); "" -}
@$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(libdir)
- @ : {- output_on() if windowsdll(); "" -}
+ @ : {- output_on() if windowsdll(); output_off() unless windowsdll(); "" -}
+ @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(INSTALLTOP)/bin
+ @ : {- output_on() unless windowsdll(); "" -}
@$(ECHO) "*** Installing runtime libraries"
@set -e; for s in dummy $(INSTALL_SHLIBS); do \
if [ "$$s" = "dummy" ]; then continue; fi; \
More information about the openssl-commits
mailing list