Make python executable variable ament_package specific (#134)

Signed-off-by: Shane Loretz <sloretz@osrfoundation.org>
ament · Aug 12, 2021 · b3669d8 · b3669d8
1 parent d695ec8
commit b3669d8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/ament_package/template/prefix_level/local_setup.bat.in b/ament_package/template/prefix_level/local_setup.bat.in
@@ -20,7 +20,7 @@ goto:eof
     set "_ament_python_executable=%AMENT_PYTHON_EXECUTABLE%"
   ) else (
     :: use the Python executable known at configure time
-    set "_ament_python_executable=@PYTHON_EXECUTABLE@"
+    set "_ament_python_executable=@ament_package_PYTHON_EXECUTABLE@"
     :: if it doesn't exist try a fall back
     if not exist "!_ament_python_executable!" (
       python --version > NUL 2> NUL

diff --git a/ament_package/template/prefix_level/local_setup.sh.in b/ament_package/template/prefix_level/local_setup.sh.in
@@ -18,7 +18,7 @@ fi
 : ${AMENT_SHELL:=sh}
 
 # use the Python executable known at configure time
-_ament_python_executable="@PYTHON_EXECUTABLE@"
+_ament_python_executable="@ament_package_PYTHON_EXECUTABLE@"
 # allow overriding it with a custom location
 if [ -n "$AMENT_PYTHON_EXECUTABLE" ]; then
   _ament_python_executable="$AMENT_PYTHON_EXECUTABLE"