From 7a428cd73b3d9e145ceca99ebc2e5704c7a56535 Mon Sep 17 00:00:00 2001
From: MilhouseVH <milhouseVH.github@nmacleod.com>
Date: Tue, 29 Mar 2016 22:51:55 +0100
Subject: [PATCH] build: ignore PKG_SOURCE_DIR when not required

---
 scripts/unpack | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/unpack b/scripts/unpack
index ba2576028b..7b07315dff 100755
--- a/scripts/unpack
+++ b/scripts/unpack
@@ -85,10 +85,12 @@ else
   fi
 fi
 
-if [ -n "$PKG_SOURCE_DIR" ]; then
-  mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
-elif [ -d $BUILD/$PKG_NAME-$PKG_VERSION* -a ! -d $BUILD/$PKG_NAME-$PKG_VERSION ]; then
-  mv $BUILD/$PKG_NAME-$PKG_VERSION* $BUILD/$PKG_NAME-$PKG_VERSION
+if [ ! -d $BUILD/$PKG_NAME-$PKG_VERSION ]; then
+  if [ -n "$PKG_SOURCE_DIR" ]; then
+    mv $BUILD/$PKG_SOURCE_DIR $BUILD/$PKG_NAME-$PKG_VERSION
+  elif [ -d $BUILD/$PKG_NAME-$PKG_VERSION* ]; then
+    mv $BUILD/$PKG_NAME-$PKG_VERSION* $BUILD/$PKG_NAME-$PKG_VERSION
+  fi
 fi
 
 if [ -d "$PKG_DIR/sources" ]; then