Merge branch 'yocto_1.8' of https://github.com/mindrunner/meta-java into pending

* 'yocto_1.8' of https://github.com/mindrunner/meta-java:
  openjdk-7: inherit pkgconfig
  ecj: fix unpackpost task
  openjdk: add pkgconfig support
  README: minor fixes
  README: update openjdk6 to the latest icedtea version
  openjdk6: add version 1.13.4
  jamvm: update git url to sourceforge while berlios is gone
  java-test-image: add jamvm, cacao and classpath
  jamvm: update git version to ebd11bde0a97b57f0d18938c6b65468d3c932719
  jamvm: add inherit pkgconfig
  README: update for icedtea version 1.12.8
  cacao: fix target compilation and packaging
  openjdk-common.inc: fix qemu usage
  openjdk6: update icedtea 1.12 to version 1.12.8
  libmatthew: Remove the dummy jar symlink
  openjdk-7-release-25b30.inc: add patch to fix hotstop build
  openjdk-7-release-25b30.inc: move nio patch to main section.
  openjdk-7-25b30: Forward port ppc patches

1 files changed, 1 insertions, 1 deletions

diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc
index 9e1cc1d..cd9d90f 100644
--- a/recipes-core/ecj/libecj-bootstrap.inc
+++ b/recipes-core/ecj/libecj-bootstrap.inc
@@ -29,7 +29,7 @@ do_unpackpost() {
   rm -rf META-INF
 
   # Move source into separate subdir.
-  if [ -d org ]; then
+  if [ -d org  -a ! -d source/org ]; then
     mv org source/
   fi
   # Remove stuff unneeded for the bootstrap compiler.