Merge pull request #268 from Skycoder42/master

Fixed shadowed build (fixes #267)

tools/linuxdeployqt/linuxdeployqt.pro

@@ -12,7 +12,7 @@ load(qt_tool)
 
 HEADERS += shared.h
 SOURCES += main.cpp \
-	shared.cpp
+    shared.cpp
 
 DEFINES -= QT_USE_QSTRINGBUILDER #leads to compile errors if not disabled
 
@@ -20,19 +20,19 @@ DEFINES -= QT_USE_QSTRINGBUILDER #leads to compile errors if not disabled
 # don't break the quotes -- at the moment, the shell commands are injected into the Makefile to have them run on every
 # build and not during configure time
 
-DEFINES += LINUXDEPLOYQT_GIT_COMMIT="'\"$(shell git rev-parse --short HEAD)\"'"
+DEFINES += LINUXDEPLOYQT_GIT_COMMIT="'\"$(shell cd $$PWD && git rev-parse --short HEAD)\"'"
 
 DEFINES += BUILD_DATE="'\"$(shell env LC_ALL=C date -u '+%Y-%m-%d %H:%M:%S %Z')\"'"
 
 _BUILD_NUMBER = $$(TRAVIS_BUILD_NUMBER)
 
 isEmpty(_BUILD_NUMBER) {
-    message(Not building on Travis CI, tagging build as local dev build)
+    message("Not building on Travis CI, tagging build as local dev build")
     DEFINES += BUILD_NUMBER="'\"<local dev build>\"'"
 } else {
-    message(Building on Travis CI build, build number $$_BUILD_NUMBER)
+    message("Building on Travis CI build, build number $$_BUILD_NUMBER")
     DEFINES += BUILD_NUMBER="'\"$$_BUILD_NUMBER\"'"
 }
 
-DEFINES += LINUXDEPLOYQT_VERSION="'\"$(shell git describe --tags $(shell git rev-list --tags --skip=1 --max-count=1) --abbrev=0)\"'"
+DEFINES += LINUXDEPLOYQT_VERSION="'\"$(shell cd $$PWD && git describe --tags $(shell cd $$PWD && git rev-list --tags --skip=1 --max-count=1) --abbrev=0)\"'"
-DEFINES += EXCLUDELIST=\""$$system($$_PRO_FILE_PWD_/../excludelist.sh)"\"
+DEFINES += EXCLUDELIST=\""$$system($$_PRO_FILE_PWD_/../excludelist.sh)"\"