From a31ea4339d6a6d1d552b3e839c3da0df4baaca07 Mon Sep 17 00:00:00 2001 From: Mike Purvis Date: Tue, 18 Feb 2020 12:05:00 -0500 Subject: [PATCH] Always pass --root to setuptools install. --- cmake/templates/python_distutils_install.sh.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/cmake/templates/python_distutils_install.sh.in b/cmake/templates/python_distutils_install.sh.in index 2e550b3f4..357149711 100755 --- a/cmake/templates/python_distutils_install.sh.in +++ b/cmake/templates/python_distutils_install.sh.in @@ -9,7 +9,6 @@ if [ -n "$DESTDIR" ] ; then /bin/echo "otherwise python's distutils will bork things." exit 1 esac - DESTDIR_ARG="--root=$DESTDIR" fi echo_and_run() { echo "+ $@" ; "$@" ; } @@ -29,5 +28,5 @@ echo_and_run /usr/bin/env \ "@CMAKE_CURRENT_SOURCE_DIR@/setup.py" \ build --build-base "@CMAKE_CURRENT_BINARY_DIR@" \ install \ - $DESTDIR_ARG \ + --root="${DESTDIR-/}" \ @SETUPTOOLS_ARG_EXTRA@ --prefix="@CMAKE_INSTALL_PREFIX@" --install-scripts="@CMAKE_INSTALL_PREFIX@/@CATKIN_GLOBAL_BIN_DESTINATION@"