[PATCH] Set GIT_DIR when calling out to Git from the Makefile

Thiago Macieira thiago at macieira.org
Tue Oct 15 20:29:23 UTC 2013


This is necessary for out-of-source builds to work.

Signed-off-by: Thiago Macieira <thiago at macieira.org>
---
 subsurface-gen-version.pri | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/subsurface-gen-version.pri b/subsurface-gen-version.pri
index 1bc1eee..a7e9cd8 100644
--- a/subsurface-gen-version.pri
+++ b/subsurface-gen-version.pri
@@ -8,8 +8,8 @@ exists(.git/HEAD): {
     VERSION_SCRIPT = $$PWD/scripts/get-version
     # always use linux here -------------------vvv    so we get the true full version
     FULL_VERSION = "`$$VERSION_SCRIPT linux`"
-    version_h.depends = $$VERSION_SCRIPT $$PWD/.git/$$system("git rev-parse --symbolic-full-name HEAD")
-    version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`$$VERSION_SCRIPT $$VER_OS`\\\" > ${QMAKE_FILE_OUT}
+    version_h.depends = $$VERSION_SCRIPT $$PWD/.git/$$system("GIT_DIR=$$PWD/.git git rev-parse --symbolic-full-name HEAD")
+    version_h.commands = echo \\$${LITERAL_HASH}define VERSION_STRING \\\"`GIT_DIR=$$PWD/.git $$VERSION_SCRIPT $$VER_OS`\\\" > ${QMAKE_FILE_OUT}
     version_h.input = GIT_HEAD
     version_h.output = $$VERSION_FILE
     version_h.variable_out = GENERATED_FILES
-- 
1.7.11.7



More information about the subsurface mailing list