Unix build: for mingw and cygwin, create the right location for DLLs
authorRichard Levitte <levitte@openssl.org>
Mon, 19 Nov 2018 09:21:49 +0000 (10:21 +0100)
committerRichard Levitte <levitte@openssl.org>
Mon, 19 Nov 2018 09:26:48 +0000 (10:26 +0100)
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@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/7654)

Configurations/unix-Makefile.tmpl

index 8b4b6fe3e2917937de6e9ffb90ced516e9f5ab64..c64c154939c19643adf6d8d99155b8ac1c4a1cf5 100644 (file)
@@ -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; \