3 files changed, 7 insertions, 0 deletions

diff --git a/recipes-core/classpath/classpath-initial_0.93.bb b/recipes-core/classpath/classpath-initial_0.93.bb
index 77831c1..13ede10 100644
--- a/recipes-core/classpath/classpath-initial_0.93.bb
+++ b/recipes-core/classpath/classpath-initial_0.93.bb
@@ -32,6 +32,9 @@ EXTRA_OECONF = " \
                 --with-vm=java \
               "
 
+# Ensure tools.zip is not installed at same path as classpath-native
+EXTRA_OEMAKE += "pkgdatadir=${STAGING_DATADIR_NATIVE}/classpath-initial"
+
 SRC_URI[md5sum] = "ffa9e9cac31c5acbf0ea9eff9efa923d"
 SRC_URI[sha256sum] = "df2d093612abd23fe67e9409d89bb2a8e79b1664fe2b2da40e1c8ed693e32945"
 
diff --git a/recipes-core/classpath/classpath-native.inc b/recipes-core/classpath/classpath-native.inc
index aefbf6d..16c1498 100644
--- a/recipes-core/classpath/classpath-native.inc
+++ b/recipes-core/classpath/classpath-native.inc
@@ -4,6 +4,8 @@ LICENSE = "Classpath"
 
 DEPENDS = "ecj-initial fastjar-native zip-native gettext-native"
 
+PR = "r1"
+
 inherit autotools native
 
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
diff --git a/recipes-core/classpath/classpath.inc b/recipes-core/classpath/classpath.inc
index 38037f3..55a3f6c 100644
--- a/recipes-core/classpath/classpath.inc
+++ b/recipes-core/classpath/classpath.inc
@@ -21,6 +21,8 @@ RPROVIDES_${PN} = "${PBN}"
 RPROVIDES_${PN}-common = "${PBN}-common"
 RPROVIDES_${PN}-gtk = "${PBN}-awt"
 
+PR = "r1"
+
 SRC_URI = "${GNU_MIRROR}/classpath/classpath-${PV}.tar.gz"
 
 S = "${WORKDIR}/${PBN}-${PV}"