diff options
Diffstat (limited to 'packages')
| -rw-r--r-- | packages/dbus-java/dbus-java_2.5.bb | 18 | ||||
| -rw-r--r-- | packages/phoneme/phoneme-advanced.inc | 2 |
2 files changed, 10 insertions, 10 deletions
diff --git a/packages/dbus-java/dbus-java_2.5.bb b/packages/dbus-java/dbus-java_2.5.bb index ef783c905d..a3ab37bd9e 100644 --- a/packages/dbus-java/dbus-java_2.5.bb +++ b/packages/dbus-java/dbus-java_2.5.bb @@ -6,10 +6,10 @@ HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" SECTION = "libs" LICENSE = "LGPLv2 AFL" DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" -RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java ${JPN}" -RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java ${JPN}" -RSUGGESTS_libdbus-java = "libunixsocket-java dbus" -PR = "r0" +RDEPENDS_dbus-java-viewer = "java2-runtime libunixsocket-java dbus-java-bin libmatthew-debug-java ${JPN}" +RDEPENDS_dbus-java-bin = "java2-runtime libunixsocket-java libmatthew-debug-java ${JPN}" +RSUGGESTS_libdbus-java = "libunixsocket-java" +PR = "r1" SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz" @@ -53,11 +53,11 @@ do_compile () { } do_install () { - oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar - oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar - oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar + oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar dbus.jar + oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar dbus-viewer.jar + oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar dbus-bin.jar - install -d ${D}${bindir} + install -d ${D}${bindir} install bin/DBusViewer ${D}${bindir} install bin/DBusCall ${D}${bindir} install bin/CreateInterface ${D}${bindir} @@ -73,7 +73,7 @@ do_install () { } do_stage () { - oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar + oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar } PACKAGE_ARCH = "all" diff --git a/packages/phoneme/phoneme-advanced.inc b/packages/phoneme/phoneme-advanced.inc index 01d192c1dc..416874178c 100644 --- a/packages/phoneme/phoneme-advanced.inc +++ b/packages/phoneme/phoneme-advanced.inc @@ -65,7 +65,7 @@ do_configure() { pmo JAVAME_LEGAL_DIR ${WORKDIR}/legal pmo "# Java toolchain binaries" - pmo JDK_HOME $JAVA_HOME + pmo JDK_HOME /dev/null pmo CVM_TARGET_TOOLS_PREFIX ${CROSS_DIR}/bin/ pmo CVM_JAVA java pmo CVM_JAVAC javac |