summaryrefslogtreecommitdiff
path: root/classes/java.bbclass
diff options
context:
space:
mode:
authorSergey Lapin <slapin@ossfans.org>2009-11-20 04:48:57 +0300
committerSergey Lapin <slapin@ossfans.org>2009-11-20 04:48:57 +0300
commitb7ca90501a633c4434904a7ce49403656edbcc22 (patch)
tree17209a712dcf8c91bf6e69e3eaf982e3306adf3b /classes/java.bbclass
parentc9d89f888ec69245c56358b454f37cffd8bb87ac (diff)
parent7a880a7050b915ea498329242bf5ebc71948301b (diff)
Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev
Diffstat (limited to 'classes/java.bbclass')
-rw-r--r--classes/java.bbclass4
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
}