aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Blundell <philb@gnu.org>2011-07-14 13:13:08 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2011-07-14 15:06:12 +0100
commitf9b50b50544385260e0fc86e11836ec689f0cdd6 (patch)
tree5ae7c240598bc5c1e8188edc31790e97f0941a0f
parente85d9ce426168374285cd7a2c87fc82bf9cb675a (diff)
downloadopenembedded-core-contrib-f9b50b50544385260e0fc86e11836ec689f0cdd6.tar.gz
openembedded-core-contrib-f9b50b50544385260e0fc86e11836ec689f0cdd6.tar.bz2
openembedded-core-contrib-f9b50b50544385260e0fc86e11836ec689f0cdd6.zip
openssl: pass ${mandir} explicitly to "make install"
Otherwise it will use the openssl internal default of /usr/share/man which may not be correct. 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.inc2
-rw-r--r--meta/recipes-connectivity/openssl/openssl_0.9.8r.bb2
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 () {
do_install () {
install -m 0755 -d ${D}${libdir}/pkgconfig
- oe_runmake INSTALL_PREFIX="${D}" install
+ oe_runmake INSTALL_PREFIX="${D}" MANDIR="${mandir}" install
chmod 644 ${D}${libdir}/pkgconfig/openssl.pc
oe_libinstall -so libcrypto ${D}${libdir}
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 @@
require openssl.inc
-PR = "r2"
+PR = "r3"
SRC_URI += "file://debian/ca.patch \
file://debian/config-hurd.patch;apply=no \
file://debian/debian-targets.patch \