Fix python agent build/install/uninstall with DESTDIR specified
PATCH 1/1 Fix python agent build/install/uninstall with DESTDIR specified
In reply to a message not in the archiveRemove the install_files.txt record since it's simpler to delete the complete folder on uninstall.
Signed-off-by Jonathan Rajotte <[email protected]>
--- liblttng-ust-python-agent/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
liblttng-ust-python-agent/Makefile.am +6 -6
@@ -15,16 +15,16 @@ all-local: $(PYTHON) setup.py build --verbose install-exec-local: - if [ "$(DESTDIR)" = "" ]; then \ - $(PYTHON) setup.py install --prefix=$(prefix) --record install_files.txt --verbose --no-compile $(DISTSETUPOPTS); \ - else \ - $(PYTHON) setup.py install --root=$(DESTDIR) --verbose install_files.txt --prefix=$(prefix) --no-compile $(DISTSETUPOPTS); \ - fi + @opts="--prefix=$(prefix) --verbose --no-compile $(DISTSETUPOPTS)"; \ + if [ "$(DESTDIR)" != "" ]; then \ + opts="$$opts --root=$(DESTDIR)"; \ + fi; \ + $(PYTHON) setup.py install $$opts; + clean-local: rm -rf build uninstall-local: - cat install_files.txt | xargs rm -rf rm -rf $(DESTDIR)$(pkgpythondir) EXTRA_DIST=$(agent_path)
Signature · 1 line
2.1.4