code.vuplus.com Git - vuplus_openvuplus_3.0/blob - meta-openvuplus/recipes-enigma2/openssl/openssl-0.9.8x/debian/engines-path.patch

   1 Upstream-Status: Backport [debian]
   2
   3 Index: openssl-0.9.8m/Makefile.org
   4 ===================================================================
   5 --- openssl-0.9.8m.orig/Makefile.org    2010-01-27 16:06:36.000000000 +0000
   6 +++ openssl-0.9.8m/Makefile.org 2010-02-27 00:43:04.000000000 +0000
   7 @@ -620,7 +620,7 @@
   8  install_sw:
   9         @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  10                 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR) \
  11 -               $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines \
  12 +               $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines \
  13                 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/pkgconfig \
  14                 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
  15                 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \
  16 Index: openssl-0.9.8m/engines/Makefile
  17 ===================================================================
  18 --- openssl-0.9.8m.orig/engines/Makefile        2009-11-10 01:53:02.000000000 +0000
  19 +++ openssl-0.9.8m/engines/Makefile     2010-02-27 00:45:03.000000000 +0000
  20 @@ -101,13 +101,13 @@
  21                                 *DSO_DL*)       sfx="sl";;      \
  22                                 *)              sfx="bad";;     \
  23                                 esac; \
  24 -                               cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
  25 +                               cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
  26                           else \
  27                                 sfx="so"; \
  28                                 cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
  29                           fi; \
  30 -                         chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new; \
  31 -                         mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
  32 +                         chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new; \
  33 +                         mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/ssl/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(LIBDIR)/engines/lib$$l.$$sfx ); \
  34                 done; \
  35         fi
  36
  37 Index: openssl-0.9.8m/Configure
  38 ===================================================================
  39 --- openssl-0.9.8m.orig/Configure       2010-02-27 00:40:42.000000000 +0000
  40 +++ openssl-0.9.8m/Configure    2010-02-27 00:46:47.000000000 +0000
  41 @@ -1738,7 +1738,7 @@
  42                 # $foo is to become "$prefix/lib$multilib/engines";
  43                 # as Makefile.org and engines/Makefile are adapted for
  44                 # $multilib suffix.
  45 -               my $foo = "$prefix/lib/engines";
  46 +               my $foo = "$prefix/lib/ssl/engines";
  47                 $foo =~ s/\\/\\\\/g;
  48                 print OUT "#define ENGINESDIR \"$foo\"\n";
  49                 }