Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status: Inappropriate [configuration] |
| 2 | |
| 3 | |
| 4 | Index: openssl-1.0.2/engines/Makefile |
| 5 | =================================================================== |
| 6 | --- openssl-1.0.2.orig/engines/Makefile |
| 7 | +++ openssl-1.0.2/engines/Makefile |
| 8 | @@ -107,13 +107,13 @@ install: |
| 9 | @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile... |
| 10 | @if [ -n "$(SHARED_LIBS)" ]; then \ |
| 11 | set -e; \ |
| 12 | - $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines; \ |
| 13 | + $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines; \ |
| 14 | for l in $(LIBNAMES); do \ |
| 15 | ( echo installing $$l; \ |
| 16 | pfx=lib; \ |
| 17 | if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ |
| 18 | sfx=".so"; \ |
| 19 | - cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ |
| 20 | + cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \ |
| 21 | else \ |
| 22 | case "$(CFLAGS)" in \ |
| 23 | *DSO_BEOS*) sfx=".so";; \ |
| 24 | @@ -122,10 +122,10 @@ install: |
| 25 | *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ |
| 26 | *) sfx=".bad";; \ |
| 27 | esac; \ |
| 28 | - cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ |
| 29 | + cp $$pfx$$l$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \ |
| 30 | fi; \ |
| 31 | - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new; \ |
| 32 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$$pfx$$l$$sfx ); \ |
| 33 | + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new; \ |
| 34 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$$pfx$$l$$sfx ); \ |
| 35 | done; \ |
| 36 | fi |
| 37 | @target=install; $(RECURSIVE_MAKE) |
| 38 | Index: openssl-1.0.2/engines/ccgost/Makefile |
| 39 | =================================================================== |
| 40 | --- openssl-1.0.2.orig/engines/ccgost/Makefile |
| 41 | +++ openssl-1.0.2/engines/ccgost/Makefile |
| 42 | @@ -47,7 +47,7 @@ install: |
| 43 | pfx=lib; \ |
| 44 | if expr "$(PLATFORM)" : "Cygwin" >/dev/null; then \ |
| 45 | sfx=".so"; \ |
| 46 | - cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ |
| 47 | + cp cyg$(LIBNAME).dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \ |
| 48 | else \ |
| 49 | case "$(CFLAGS)" in \ |
| 50 | *DSO_BEOS*) sfx=".so";; \ |
| 51 | @@ -56,10 +56,10 @@ install: |
| 52 | *DSO_WIN32*) sfx="eay32.dll"; pfx=;; \ |
| 53 | *) sfx=".bad";; \ |
| 54 | esac; \ |
| 55 | - cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ |
| 56 | + cp $${pfx}$(LIBNAME)$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \ |
| 57 | fi; \ |
| 58 | - chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new; \ |
| 59 | - mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/$${pfx}$(LIBNAME)$$sfx; \ |
| 60 | + chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new; \ |
| 61 | + mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/$${pfx}$(LIBNAME)$$sfx; \ |
| 62 | fi |
| 63 | |
| 64 | links: |