← Back to branch summary

~ubuntu-branches/ubuntu/saucy/openssl098/saucy-updates

« back to all changes in this revision

Viewing changes to debian/patches/engines-path.patch

  • Committer: Bazaar Package Importer
  • Author(s): Kurt Roeckx
  • Date: 2011-03-23 19:50:31 UTC
  • Revision ID: james.westby@ubuntu.com-20110323195031-mmhmc4v3kv1smgal
Tags: 0.9.8o-6
Upload as transitional openssl098 source package, just keeping
the library.

Show diffs side-by-side

added added

removed removed

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