From e29bd968bd8f6eb6eca1b986d6d714d27c171afd Mon Sep 17 00:00:00 2001 From: Robert Schuster Date: Thu, 15 May 2008 16:14:40 +0000 Subject: libmatthew 0.5: Recipe cleanup. dbus-java 2.3: Recipe cleanup, fixed do_stage function name. --- packages/dbus-java/dbus-java_2.3.bb | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'packages/dbus-java') diff --git a/packages/dbus-java/dbus-java_2.3.bb b/packages/dbus-java/dbus-java_2.3.bb index 1c30fc7fe4..71181d961d 100644 --- a/packages/dbus-java/dbus-java_2.3.bb +++ b/packages/dbus-java/dbus-java_2.3.bb @@ -4,10 +4,10 @@ DESCRIPTION_dbus-java-bin = "${DESCRIPTION} (Binaries)" LICENSE = "GPLv2 AFL" SECTION = "libs" -HOMEPAGE = "http://jalimo.org" +HOMEPAGE = "http://dbus.freedesktop.org/doc/dbus-java" AUTHOR = "Matthew Johnson " -PR = "r2" +PR = "r3" inherit java-library @@ -15,7 +15,7 @@ SRC_URI = "http://dbus.freedesktop.org/releases/dbus-java/dbus-java-${PV}.tar.gz S = "${WORKDIR}/dbus-java-${PV}" -DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native" +DEPENDS = "libmatthew docbook-utils-native docbook-sgml-dtd-4.1-native fastjar-native" RSUGGESTS_libdbus-java = "libmatthew-java dbus" RDEPENDS_dbus-java-viewer = "java2-runtime libmatthew-java ${JPN}" RDEPENDS_dbus-java-bin = "java2-runtime libmatthew-java ${JPN}" @@ -25,8 +25,8 @@ do_compile () { oe_runmake \ JCFLAGS="-source 1.5" \ JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR}/java" \ - JAVAUNIXJARDIR="${STAGING_DATADIR}/java" \ + JARPREFIX="${STAGING_DATADIR_JAVA}" \ + JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ CLASSPATH="${S}/classes" \ JAR="fastjar" \ .binclasses @@ -34,8 +34,8 @@ do_compile () { oe_runmake \ JCFLAGS="-source 1.5" \ JAVAC="javac" \ - JARPREFIX="${STAGING_DATADIR}/java" \ - JAVAUNIXJARDIR="${STAGING_DATADIR}/java" \ + JARPREFIX="${STAGING_DATADIR_JAVA}" \ + JAVAUNIXJARDIR="${STAGING_DATADIR_JAVA}" \ CLASSPATH="${S}/classes" \ JAR="fastjar" \ all @@ -47,8 +47,8 @@ do_compile () { oe_runmake \ JAVAC="oefatal \"No Java compilation expected here.\"" \ JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir}/java \ - JAVAUNIXPATH=${datadir}/java \ + JARPREFIX=${datadir_java} \ + JAVAUNIXPATH=${datadir_java} \ all # Trigger generation of all documentation files to prevent this @@ -56,12 +56,12 @@ do_compile () { oe_runmake \ JAVAC="oefatal \"No Java compilation expected here.\"" \ JAR="oefatal \"No jar invocation expected here.\"" \ - JARPREFIX=${datadir}/java \ - JAVAUNIXPATH=${datadir}/java \ + JARPREFIX=${datadir_java} \ + JAVAUNIXPATH=${datadir_java} \ CreateInterface.1 ListDBus.1 DBusDaemon.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL DBusCall.1 } -do_staging () { +do_stage () { oe_jarinstall -s ${JPN}-${PV}.jar ${JPN}.jar } -- cgit v1.2.3