[oe-commits] Phil Blundell : openssl: backport fix for empty prefix from oe master

[git version control]

Module: openembedded-core.git
Branch: master
Commit: d82ed45d390f48b950cc490a055daa746f4a716a
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=d82ed45d390f48b950cc490a055daa746f4a716a

Author: Phil Blundell <pb at pbcl.net>
Date:   Tue May 17 13:35:37 2011 +0100

openssl: backport fix for empty prefix from oe master

This fixes a build failure when ${prefix}="".

Signed-off-by: Phil Blundell <philb at gnu.org>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 meta/recipes-connectivity/openssl/openssl.inc |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/meta/recipes-connectivity/openssl/openssl.inc b/meta/recipes-connectivity/openssl/openssl.inc
index fe168c3..f1ac718 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 () {