package/openssl/openssl-0.9.8i-01-enginedir.patch

   1 --- openssl-0.9.8h.orig/Configure       2008-06-08 10:42:11.000000000 +0200
   2 +++ openssl-0.9.8h/Configure    2008-06-08 10:54:24.000000000 +0200
   3 @@ -1517,7 +1517,7 @@ while (<IN>)
   4         if      (/^#define\s+OPENSSLDIR/)
   5                 { print OUT "#define OPENSSLDIR \"$openssldir\"\n"; }
   6         elsif   (/^#define\s+ENGINESDIR/)
   7 -               { print OUT "#define ENGINESDIR \"$prefix/lib/engines\"\n"; }
   8 +               { print OUT "#define ENGINESDIR \"$openssldir/engines\"\n"; }
   9         elsif   (/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
  10                 { printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
  11                         if $export_var_as_fn;
  12 --- openssl-0.9.8h.orig/engines/Makefile        2006-02-04 02:49:34.000000000 +0100
  13 +++ openssl-0.9.8h/engines/Makefile     2008-06-08 12:17:53.000000000 +0200
  14 @@ -89,6 +89,8 @@ install:
  15         @[ -n "$(INSTALLTOP)" ] # should be set by top Makefile...
  16         @if [ -n "$(SHARED_LIBS)" ]; then \
  17                 set -e; \
  18 +               [ -d $(INSTALL_PREFIX)$(INSTALLTOP)/$(ENGINESDIR) ] || \
  19 +                       $(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/$(ENGINESDIR); \
  20                 for l in $(LIBNAMES); do \
  21                         ( echo installing $$l; \
  22                           if [ "$(PLATFORM)" != "Cygwin" ]; then \
  23 @@ -97,13 +99,13 @@ install:
  24                                 *DSO_DL*)       sfx="sl";;      \
  25                                 *)              sfx="bad";;     \
  26                                 esac; \
  27 -                               cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
  28 +                               cp lib$$l.$$sfx $(INSTALL_PREFIX)$(INSTALLTOP)/$(ENGINESDIR)/lib$$l.$$sfx.new; \
  29                           else \
  30                                 sfx="so"; \
  31 -                               cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
  32 +                               cp cyg$$l.dll $(INSTALL_PREFIX)$(INSTALLTOP)/$(ENGINESDIR)/lib$$l.$$sfx.new; \
  33                           fi; \
  34 -                         chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new; \
  35 -                         mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines/lib$$l.$$sfx ); \
  36 +                         chmod 555 $(INSTALL_PREFIX)$(INSTALLTOP)/$(ENGINESDIR)/lib$$l.$$sfx.new; \
  37 +                         mv -f $(INSTALL_PREFIX)$(INSTALLTOP)/$(ENGINESDIR)/lib$$l.$$sfx.new $(INSTALL_PREFIX)$(INSTALLTOP)/$(ENGINESDIR)/lib$$l.$$sfx ); \
  38                 done; \
  39         fi
  40
  41 --- openssl-0.9.8h.orig/Makefile        2008-06-08 10:42:11.000000000 +0200
  42 +++ openssl-0.9.8h/Makefile     2008-06-08 12:29:37.000000000 +0200
  43 @@ -480,7 +480,7 @@ install: all install_sw
  44  install_sw:
  45         @$(PERL) $(TOP)/util/mkdir-p.pl $(INSTALL_PREFIX)$(INSTALLTOP)/bin \
  46                 $(INSTALL_PREFIX)$(INSTALLTOP)/lib \
  47 -               $(INSTALL_PREFIX)$(INSTALLTOP)/lib/engines \
  48 +               $(INSTALL_PREFIX)$(INSTALLTOP)/$(ENGINESDIR) \
  49                 $(INSTALL_PREFIX)$(INSTALLTOP)/lib/pkgconfig \
  50                 $(INSTALL_PREFIX)$(INSTALLTOP)/include/openssl \
  51                 $(INSTALL_PREFIX)$(OPENSSLDIR)/misc \