From df4e1341d2581d113c7c838ccdc4733bd8f6cf65 Mon Sep 17 00:00:00 2001
From: Stephan Raue <stephan@openelec.tv>
Date: Fri, 29 Mar 2013 14:17:24 +0100
Subject: [PATCH] scripts/build: refactor PKG_BUILD detection

Signed-off-by: Stephan Raue <stephan@openelec.tv>
---
 scripts/build | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/scripts/build b/scripts/build
index b5aaff04db..f10b0a31aa 100755
--- a/scripts/build
+++ b/scripts/build
@@ -57,8 +57,18 @@ if [ ! -f $STAMP ]; then
     $SCRIPTS/build $p
   done
 
-  [ -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}[-_.]${PKG_VERSION}`
-  [ -d $BUILD/${PKG_NAME}${PKG_VERSION} ] && PKG_BUILD=`ls -d $BUILD/${PKG_NAME}${PKG_VERSION}`
+  if [ -d "$BUILD/${PKG_NAME}-${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}-${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}_${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}_${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}.${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}.${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}${PKG_VERSION}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}${PKG_VERSION}"
+  elif [ -d "$BUILD/${PKG_NAME}" ]; then
+    PKG_BUILD="$BUILD/${PKG_NAME}"
+  fi
+
   [ "$PKG_AUTORECONF" = yes ] && $SCRIPTS/autoreconf $1
 
   if [ -f $PKG_DIR/build ]; then