From 85e466de20c13af2e2d74cd9985c686115ceeb90 Mon Sep 17 00:00:00 2001
From: Robert Schuster <robertschuster@fsfe.org>
Date: Wed, 16 Jun 2010 18:53:02 +0200
Subject: [PATCH] cacao *: Install libjvm.so into separate folder in ${libdir}.

---
 recipes/cacao/cacao.inc       | 3 ++-
 recipes/cacao/cacao_0.99.3.bb | 2 +-
 recipes/cacao/cacao_0.99.4.bb | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/recipes/cacao/cacao.inc b/recipes/cacao/cacao.inc
index fedc5ac399..9749dce0e7 100644
--- a/recipes/cacao/cacao.inc
+++ b/recipes/cacao/cacao.inc
@@ -27,7 +27,8 @@ EXTRA_OECONF = "\
     --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \
     --with-jni_md_h=${STAGING_INCDIR}/classpath \
     --with-jni_h=${STAGING_INCDIR}/classpath \
-  "
+	--libdir=${libdir}/cacao \
+"
 
 PACKAGES = "${PN} ${PN}-doc ${PN}-dbg"
 
diff --git a/recipes/cacao/cacao_0.99.3.bb b/recipes/cacao/cacao_0.99.3.bb
index 142a40bdf2..b9856fadab 100644
--- a/recipes/cacao/cacao_0.99.3.bb
+++ b/recipes/cacao/cacao_0.99.3.bb
@@ -1,6 +1,6 @@
 require cacao.inc
 
-PR = "r8"
+PR = "r9"
 
 SRC_URI = "\
   http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \
diff --git a/recipes/cacao/cacao_0.99.4.bb b/recipes/cacao/cacao_0.99.4.bb
index 5ae0330a6c..1e5f338319 100644
--- a/recipes/cacao/cacao_0.99.4.bb
+++ b/recipes/cacao/cacao_0.99.4.bb
@@ -1,6 +1,6 @@
 require cacao.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "\
 	http://www.complang.tuwien.ac.at/cacaojvm/download/cacao-${PV}/cacao-${PV}.tar.bz2 \
-- 
2.39.5