From 17ae278b83c486ee23a65e059b7ef04aaeb0fa40 Mon Sep 17 00:00:00 2001
From: FichteFoll <fichtefoll2@googlemail.com>
Date: Wed, 28 Aug 2019 22:04:38 +0200
Subject: [PATCH] Fix git_version.h generation

---
 tools/version.sh | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/tools/version.sh b/tools/version.sh
index b277a6e91..b3080766b 100755
--- a/tools/version.sh
+++ b/tools/version.sh
@@ -1,8 +1,8 @@
 srcdir="$1"
 
 # If no git repo try to read from the existing git_version.h, for building from tarballs
+version_h_path="${srcdir}/git_version.h"
 if ! test -d "${srcdir}/.git"; then
-  version_h_path="${srcdir}/build/git_version.h"
   if test -f "${version_h_path}"; then
     while read line; do
       set -- $line
@@ -55,9 +55,6 @@ new_version_h="\
 #define INSTALLER_VERSION \"${installer_version}\"
 #define RESOURCE_BASE_VERSION ${resource_version}"
 
-# may not exist yet for out of tree builds
-mkdir -p build
-version_h_path="build/git_version.h"
 
 # Write it only if it's changed to avoid spurious rebuilds
 # This bizzare comparison method is due to that newlines in shell variables are very exciting
@@ -71,7 +68,7 @@ export BUILD_GIT_VERSION_NUMBER="${git_revision}"
 export BUILD_GIT_VERSION_STRING="${git_version_str}"
 export VERSION_SOURCE="from git"
 
-cat << EOF > build/git_version.xml
+cat << EOF > "${srcdir}/git_version.xml"
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>