Commit b4917d79 authored by Craig Watson's avatar Craig Watson

correct detection of current working directory in build scripts

parent d5bb6a29
...@@ -20,7 +20,8 @@ initializeVariables() ...@@ -20,7 +20,8 @@ initializeVariables()
STANDARD_QT_USED=false STANDARD_QT_USED=false
# Root directory # Root directory
PROJECT_ROOT="`pwd`/../.." SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
PROJECT_ROOT="$SCRIPT_PATH/../.."
BUILD_DIR="$PROJECT_ROOT/build/linux/release" BUILD_DIR="$PROJECT_ROOT/build/linux/release"
PRODUCT_PATH="$BUILD_DIR/product" PRODUCT_PATH="$BUILD_DIR/product"
......
...@@ -107,7 +107,7 @@ copyQtPlugin(){ ...@@ -107,7 +107,7 @@ copyQtPlugin(){
initializeVariables() initializeVariables()
{ {
# This script's path # This script's path
SCRIPT_PATH=`pwd` SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
PROJECT_ROOT="$SCRIPT_PATH/../.." PROJECT_ROOT="$SCRIPT_PATH/../.."
......
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# --------------------------------------------------------------------- # ---------------------------------------------------------------------
SCRIPT_PATH="`pwd`" SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
PROJECT_ROOT="$SCRIPT_PATH/../.." PROJECT_ROOT="$SCRIPT_PATH/../.."
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment