2 files changed, 5 insertions, 2 deletions
diff --git a/debian/_buildscripts/local/internals/_build_common.sh b/debian/_buildscripts/local/internals/_build_common.sh
index be1b520ec..0a17cb700 100755
--- a/debian/_buildscripts/local/internals/_build_common.sh
+++ b/debian/_buildscripts/local/internals/_build_common.sh
@@ -89,6 +89,8 @@ function _set_path_variables()
 #----------------------------
 function init_common()
 {
+	local CURR_DIR=`pwd`
+
   # Check script folder
   export SCRIPT_DIR=$(dirname $(readlink -f "$0"))
 
@@ -230,7 +232,7 @@ function init_common()
     exit 10
   fi
 
-  cd "$SCRIPT_DIR"
+  cd "${CURR_DIR}"
 }
 
 
diff --git a/debian/_buildscripts/local/internals/_build_set_common.sh b/debian/_buildscripts/local/internals/_build_set_common.sh
index 08b4bf80e..82e7e8bba 100755
--- a/debian/_buildscripts/local/internals/_build_set_common.sh
+++ b/debian/_buildscripts/local/internals/_build_set_common.sh
@@ -1,7 +1,8 @@
 #!/bin/bash
 
 # Load common code and initialization
-. ./internals/_build_common.sh
+export SCRIPT_DIR=$(dirname $(readlink -f "$0"))
+. ${SCRIPT_DIR}/internals/_build_common.sh
 init_common
 
 _BUILDSET_TIMER=1