From 8b32cd92a149f9572cb35611bf20a4e2bf6ddcef Mon Sep 17 00:00:00 2001 From: Phil Blundell Date: Tue, 17 May 2011 13:35:37 +0100 Subject: openssl: backport fix for empty prefix from oe master This fixes a build failure when ${prefix}="". (From OE-Core rev: d82ed45d390f48b950cc490a055daa746f4a716a) Signed-off-by: Phil Blundell Signed-off-by: Richard Purdie --- meta/recipes-connectivity/openssl/openssl.inc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'meta/recipes-connectivity/openssl') diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc index fe168c3c2b..f1ac7186cd 100644 --- a/meta/recipes-connectivity/openssl/openssl.inc +++ b/meta/recipes-connectivity/openssl/openssl.inc @@ -89,7 +89,11 @@ do_configure () { esac # inject machine-specific flags sed -i -e "s|^\(\"$target\",\s*\"[^:]\+\):\([^:]\+\)|\1:${CFLAG}|g" Configure - perl ./Configure shared --prefix=${prefix} --openssldir=${libdir}/ssl $target + useprefix=${prefix} + if [ "x$useprefix" = "x" ]; then + useprefix=/ + fi + perl ./Configure ${EXTRA_OECONF} shared --prefix=$useprefix --openssldir=${libdir}/ssl $target } do_compile () { -- cgit v1.2.3-54-g00ecf