Merge branch 'org.openembedded.dev' of git@git.openembedded.net:openembedded into org.openembedded.dev

1 files changed, 7 insertions, 6 deletions

diff --git a/classes/src_distribute_local.bbclass b/classes/src_distribute_local.bbclass
index 5cec2880aa..7b1e7d7e48 100644
--- a/classes/src_distribute_local.bbclass
+++ b/classes/src_distribute_local.bbclass
@@ -6,24 +6,25 @@ SRC_DISTRIBUTECOMMAND[dirs] = "${SRC_DISTRIBUTEDIR}/${LIC}/${PN}"
 
 # symlinks the files to the SRC_DISTRIBUTEDIR
 SRC_DISTRIBUTECOMMAND-symlink () {
-    test -e ${SRC}.md5 && ln -sf ${SRC}.md5 .
-    ln -sf ${SRC} .
+    test -e "${SRC}.md5" && ln -sf "${SRC}.md5" .
+    ln -sf "${SRC}" .
 }
 
 # copies the files to the SRC_DISTRIBUTEDIR
 SRC_DISTRIBUTECOMMAND-copy () {
-    test -e ${SRC}.md5 && cp -f ${SRC}.md5 .
-    cp -fr ${SRC} .
+    test -e "${SRC}.md5" && cp -f "${SRC}.md5" .
+    cp -fr "${SRC}" .
 }
 
 # moves the files to the SRC_DISTRIBUTEDIR and symlinks them back
 SRC_DISTRIBUTECOMMAND-move+symlink () {
     if ! [ -L ${SRC} ]; then
+        src=`basename "${SRC}"`
         mv ${SRC} .
-        ln -sf $PWD/`basename ${SRC}` ${SRC}
+        ln -sf $src "${SRC}"
         if [ -e ${SRC}.md5 ]; then
             mv ${SRC}.md5 .
-            ln -sf $PWD/`basename ${SRC}.md5` ${SRC}.md5
+            ln -sf $src "${SRC}.md5"
         fi
     fi
 }