diff options
author | Graeme Gregory <dp@xora.org.uk> | 2009-11-06 09:45:59 +0000 |
---|---|---|
committer | Graeme Gregory <dp@xora.org.uk> | 2009-11-06 09:45:59 +0000 |
commit | 654b4ac743061b15e0ed9ee8652d4462221b644d (patch) | |
tree | 433fc0aa49af16fbce666ceb640b49b811b5f718 /classes/java.bbclass | |
parent | 5fb5803ee97aa2c93328c4b2925142585e49adbe (diff) | |
parent | 35cc93da885ac6d438da6aaed9517e91d4a7e6b3 (diff) |
Merge branch 'org.openembedded.dev' of git+ssh://git@git.openembedded.org/openembedded into org.openembedded.dev
Diffstat (limited to 'classes/java.bbclass')
-rw-r--r-- | classes/java.bbclass | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/classes/java.bbclass b/classes/java.bbclass index cacd2ce525..b68035c13e 100644 --- a/classes/java.bbclass +++ b/classes/java.bbclass @@ -68,11 +68,11 @@ oe_jarinstall() { # Creates symlinks out of the remaining arguments. while [ "$#" -gt 0 ]; do - if [ -e $dir/$1 ]; then + if [ -e $dir/$1 -o -h $dir/$1 ]; then oewarn "file was in the way. removing:" $dir/$1 rm $dir/$1 fi - ln -sf $destname $dir/$1 + ln -s $destname $dir/$1 shift done } |