diff options
author | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-04-24 22:17:04 +0200 |
---|---|---|
committer | Henning Heinold <heinold@inf.fu-berlin.de> | 2013-04-24 22:18:05 +0200 |
commit | e20269243f8725949eb0124d6dded1f4ce78dfa1 (patch) | |
tree | c7b2e0a37ab51d2f6405fca3af6b5f73958a11ec | |
parent | 798b0c58baeb339379bf65d4b9fb0a2c9a47a9f3 (diff) | |
download | meta-java-e20269243f8725949eb0124d6dded1f4ce78dfa1.tar.gz |
dbus-java: switch to dbus-java-bin an dbus-java-viewr to ${PN}- packages name
Signed-off-by: Henning Heinold <heinold@inf.fu-berlin.de>
-rw-r--r-- | recipes-extended/dbus/dbus-java_2.7.bb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/recipes-extended/dbus/dbus-java_2.7.bb b/recipes-extended/dbus/dbus-java_2.7.bb index 2fae051..a3f7a40 100644 --- a/recipes-extended/dbus/dbus-java_2.7.bb +++ b/recipes-extended/dbus/dbus-java_2.7.bb | |||
@@ -40,7 +40,7 @@ do_compile () { | |||
40 | 40 | ||
41 | # Generated shell scripts will have staging paths inside them. | 41 | # Generated shell scripts will have staging paths inside them. |
42 | rm bin/* | 42 | rm bin/* |
43 | 43 | ||
44 | # Generate them again with target paths. | 44 | # Generate them again with target paths. |
45 | oe_runmake \ | 45 | oe_runmake \ |
46 | JAVAC="oefatal \"No Java compilation expected here.\"" \ | 46 | JAVAC="oefatal \"No Java compilation expected here.\"" \ |
@@ -66,7 +66,7 @@ do_install () { | |||
66 | oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar dbus.jar | 66 | oe_jarinstall ${JPN}-${PV}.jar ${JPN}.jar dbus.jar |
67 | oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar dbus-viewer.jar | 67 | oe_jarinstall dbus-java-viewer-${PV}.jar dbus-java-viewer.jar dbus-viewer.jar |
68 | oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar dbus-bin.jar | 68 | oe_jarinstall dbus-java-bin-${PV}.jar dbus-java-bin.jar dbus-bin.jar |
69 | 69 | ||
70 | install -d ${D}${bindir} | 70 | install -d ${D}${bindir} |
71 | install bin/DBusViewer ${D}${bindir} | 71 | install bin/DBusViewer ${D}${bindir} |
72 | install bin/DBusCall ${D}${bindir} | 72 | install bin/DBusCall ${D}${bindir} |
@@ -84,9 +84,9 @@ do_install () { | |||
84 | 84 | ||
85 | # ${JPN} must be last otherwise it would pick up dbus-viewer*.jar | 85 | # ${JPN} must be last otherwise it would pick up dbus-viewer*.jar |
86 | # and dbus-bin*.jar | 86 | # and dbus-bin*.jar |
87 | PACKAGES = "dbus-java-viewer dbus-java-viewer-doc dbus-java-bin dbus-java-bin-doc ${JPN}" | 87 | PACKAGES = "${PN}-viewer ${PN}-viewer-doc ${PN}-bin ${PN}-bin-doc ${JPN}" |
88 | 88 | ||
89 | FILES_dbus-java-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" | 89 | FILES_${PN}-viewer = "${datadir}/java/dbus-java-viewer*.jar ${bindir}/DBusViewer" |
90 | FILES_dbus-java-viewer-doc = "${mandir}/DBusViewer*" | 90 | FILES_${PN}-viewer-doc = "${mandir}/DBusViewer*" |
91 | FILES_dbus-java-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" | 91 | FILES_${PN}-bin = "${datadir}/java/dbus-java-bin*.jar ${bindir}" |
92 | FILES_dbus-java-bin-doc = "${mandir} ${docdir}/${JPN}" | 92 | FILES_${PN}-bin-doc = "${mandir} ${docdir}/${JPN}" |