From fc0831392514366961e83dc046871d77f23f9320 Mon Sep 17 00:00:00 2001
From: Lukas Joswiak <lukas.joswiak@snowflake.com>
Date: Thu, 11 Nov 2021 01:02:24 -0800
Subject: [PATCH] Use path relative to Python binary

---
 documentation/CMakeLists.txt       | 1 -
 documentation/sphinx/conf.py       | 2 +-
 packaging/msi/MSIInstaller.wixproj | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/documentation/CMakeLists.txt b/documentation/CMakeLists.txt
index 083f5abca3..7899af2261 100644
--- a/documentation/CMakeLists.txt
+++ b/documentation/CMakeLists.txt
@@ -49,7 +49,6 @@ function(add_documentation_target)
   add_custom_command(
     OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${target}_done
     COMMAND ${CMAKE_COMMAND} -E make_directory ${out_dir} &&
-            FDB_VERSIONS_TARGET_PATH=${CMAKE_BINARY_DIR}/versions.target
             ${python_command} ${SPHINX_COMMAND} -W -b ${target}
                               -d ${doctree} -c ${sphinx_dir}
                               ${sphinx_dir}/source
diff --git a/documentation/sphinx/conf.py b/documentation/sphinx/conf.py
index 75270bcd55..031c7d6f67 100644
--- a/documentation/sphinx/conf.py
+++ b/documentation/sphinx/conf.py
@@ -53,7 +53,7 @@ copyright = u'2013-2021 Apple, Inc and the FoundationDB project authors'
 
 # Load the version information from 'versions.target'
 import xml.etree.ElementTree as ET
-version_path = os.environ['FDB_VERSIONS_TARGET_PATH']
+version_path = os.path.join(os.path.dirname(sys.executable), '..', '..', '..', 'versions.target')
 tree = ET.parse(version_path)
 root = tree.getroot()
 
diff --git a/packaging/msi/MSIInstaller.wixproj b/packaging/msi/MSIInstaller.wixproj
index 0950120031..da46fbc9ba 100644
--- a/packaging/msi/MSIInstaller.wixproj
+++ b/packaging/msi/MSIInstaller.wixproj
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(OutDir)versions.target" />
+  <Import Project="$(SolutionDir)versions.target" />
   <PropertyGroup Condition="'$(Release)' != 'true' ">
     <SuppressValidation>true</SuppressValidation>
     <PreReleaseDecoration>-PRERELEASE</PreReleaseDecoration>