[oe-commits] Stefan Schmidt : cacao.inc: Fix path to cacaoh staging

[git version control]

Module: openembedded.git
Branch: master
Commit: 9c39314133c257a877e842be7aae311ed41d1d9a
URL:    http://gitweb.openembedded.net/?p=openembedded.git&a=commit;h=9c39314133c257a877e842be7aae311ed41d1d9a

Author: Stefan Schmidt <stefan at datenfreihafen.org>
Date:   Thu Oct  7 19:44:13 2010 +0200

cacao.inc: Fix path to cacaoh staging

Problem found and fixed by dfoley <dfoley at telus.net>

Signed-off-by: dfoley <dfoley at telus.net>
Signed-off-by: Stefan Schmidt <stefan at datenfreihafen.org>

---

 recipes/cacao/cacao.inc |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/recipes/cacao/cacao.inc b/recipes/cacao/cacao.inc
index c366b74..ba781e2 100644
--- a/recipes/cacao/cacao.inc
+++ b/recipes/cacao/cacao.inc
@@ -6,6 +6,8 @@ SECTION  = "interpreters"
 
 DEPENDS = "zlib libtool classpath cacaoh-native virtual/javac-native"
 
+PR = "r1"
+
 # Avoid version number here, otherwise dpkg will expect a package name
 # and cannot be satisfied with a package that provides classpath.
 RDEPENDS_${PN} = "classpath"
@@ -23,7 +25,7 @@ EXTRA_OECONF = "\
 	${@['','--enable-softfloat'][bb.data.getVar('TARGET_FPU',d,1) == 'soft']} \
 	--enable-debug \
 	--with-vm-zip=${datadir}/cacao/vm.zip \
-	--with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV} \
+	--with-cacaoh=${STAGING_BINDIR_NATIVE}/cacaoh-${PV}/cacaoh \
     --with-build-java-runtime-library-classes=${STAGING_DATADIR}/classpath/glibj.zip \
     --with-java-runtime-library-classes=${datadir}/classpath/glibj.zip \
     --with-java-runtime-library-libdir=${libdir_jni}:${libdir} \