Merge pull request #23 from OSSystems/master

Java library packaging improvements

2 files changed, 3 insertions, 3 deletions

diff --git a/classes/java-library.bbclass b/classes/java-library.bbclass
index 4396bb3..52c932c 100644
--- a/classes/java-library.bbclass
+++ b/classes/java-library.bbclass
@@ -32,7 +32,7 @@ JPN ?= "${@java_package_name(d)}"
 
 DEPENDS_prepend = "virtual/javac-native fastjar-native "
 
-PACKAGES = "${JPN}"
+PACKAGES += "${JPN}"
 
 PACKAGE_ARCH_${JPN} = "all"
 
@@ -53,6 +53,6 @@ do_removebinaries() {
 
 addtask removebinaries after do_unpack before do_patch
 
-do_install() {
+do_install_append() {
   oe_jarinstall ${JARFILENAME} ${ALTJARFILENAMES}
 }
diff --git a/classes/java.bbclass b/classes/java.bbclass
index 235ab23..464d8a8 100644
--- a/classes/java.bbclass
+++ b/classes/java.bbclass
@@ -58,7 +58,7 @@ oe_jarinstall() {
   # Creates symlinks out of the remaining arguments.
   while [ "$#" -gt 0 ]; do
     if [ -e $dir/$1 -o -h $dir/$1 ]; then
-      oewarn "file was in the way. removing:" $dir/$1
+      bbwarn "file was in the way. removing:" $dir/$1
       rm $dir/$1
     fi
     ln -s $destname $dir/$1