Merge pull request #32 from kraj/master

Forward port dbus-java recipes and some more openjdk-7 fixes

1 files changed, 5 insertions, 4 deletions

diff --git a/recipes-core/ecj/libecj-bootstrap.inc b/recipes-core/ecj/libecj-bootstrap.inc
index 4f85ba9..9e1cc1d 100644
--- a/recipes-core/ecj/libecj-bootstrap.inc
+++ b/recipes-core/ecj/libecj-bootstrap.inc
@@ -25,17 +25,18 @@ do_unpackpost() {
   fi
 
   # Remove crap.
-  rm about.html build.xml
+  rm -f about.html build.xml
   rm -rf META-INF
 
   # Move source into separate subdir.
-  mv org source/
-
+  if [ -d org ]; then
+    mv org source/
+  fi
   # Remove stuff unneeded for the bootstrap compiler.
   rm -rf source/org/eclipse/jdt/internal/compiler/apt
   rm -rf source/org/eclipse/jdt/internal/compiler/tool
   rm -rf source/org/eclipse/jdt/internal/antadapter
-  rm source/org/eclipse/jdt/core/JDTCompilerAdapter.java
+  rm -f source/org/eclipse/jdt/core/JDTCompilerAdapter.java
 
   # Make a copy of the remaining source to get the embedded
   # resources.