Patchwork openssl: pass ${mandir} explicitly to "make install"

login
register
mail settings
Submitter Phil Blundell
Date July 14, 2011, 12:13 p.m.
Message ID <1310645589.2378.61.camel@phil-desktop>
Download mbox | patch
Permalink /patch/7595/
State New, archived
Headers show

Comments

Phil Blundell - July 14, 2011, 12:13 p.m.
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>
---
 meta/recipes-connectivity/openssl/openssl.inc      |    2 +-
 .../recipes-connectivity/openssl/openssl_0.9.8r.bb |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
Richard Purdie - July 14, 2011, 2:06 p.m.
On Thu, 2011-07-14 at 13:13 +0100, Phil Blundell wrote:
> 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>

Merged to master, thanks.

Richard

Patch

diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index d42ae1c..39143ad 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 c95b1f1..ea83cb8 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 \