diff options
author | Phil Blundell <philb@gnu.org> | 2011-07-14 13:13:08 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-07-14 15:07:49 +0100 |
commit | 660093c1d8915a5adba068cea3217596e2d49526 (patch) | |
tree | f64be131c101389f3878a048c17b30ba94769f12 | |
parent | f30690695628d44023bd2b2d0e46dca10f7d9ba0 (diff) | |
download | poky-660093c1d8915a5adba068cea3217596e2d49526.tar.gz |
openssl: pass ${mandir} explicitly to "make install"
Otherwise it will use the openssl internal default of /usr/share/man which may not be correct.
(From OE-Core rev: f9b50b50544385260e0fc86e11836ec689f0cdd6)
Signed-off-by: Phil Blundell <philb@gnu.org>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl.inc | 2 | ||||
-rw-r--r-- | meta/recipes-connectivity/openssl/openssl_0.9.8r.bb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index d42ae1c5d5..39143ad90a 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc | |||
@@ -102,7 +102,7 @@ do_compile () { | |||
102 | 102 | ||
103 | do_install () { | 103 | do_install () { |
104 | install -m 0755 -d ${D}${libdir}/pkgconfig | 104 | install -m 0755 -d ${D}${libdir}/pkgconfig |
105 | oe_runmake INSTALL_PREFIX="${D}" install | 105 | oe_runmake INSTALL_PREFIX="${D}" MANDIR="${mandir}" install |
106 | chmod 644 ${D}${libdir}/pkgconfig/openssl.pc | 106 | chmod 644 ${D}${libdir}/pkgconfig/openssl.pc |
107 | oe_libinstall -so libcrypto ${D}${libdir} | 107 | oe_libinstall -so libcrypto ${D}${libdir} |
108 | oe_libinstall -so libssl ${D}${libdir} | 108 | oe_libinstall -so libssl ${D}${libdir} |
diff --git a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb index c95b1f17cd..ea83cb888d 100644 --- a/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb +++ b/meta/recipes-connectivity/openssl/openssl_0.9.8r.bb | |||
@@ -1,6 +1,6 @@ | |||
1 | require openssl.inc | 1 | require openssl.inc |
2 | 2 | ||
3 | PR = "r2" | 3 | PR = "r3" |
4 | SRC_URI += "file://debian/ca.patch \ | 4 | SRC_URI += "file://debian/ca.patch \ |
5 | file://debian/config-hurd.patch;apply=no \ | 5 | file://debian/config-hurd.patch;apply=no \ |
6 | file://debian/debian-targets.patch \ | 6 | file://debian/debian-targets.patch \ |