From dce1cbecb69ae3ad489668226dca583b8bee04ab Mon Sep 17 00:00:00 2001 From: Jonathan Rajotte Date: Fri, 16 Oct 2015 15:07:31 -0400 Subject: [PATCH] Fix python agent build/install/uninstall with DESTDIR specified Remove the install_files.txt record since it's simpler to delete the complete folder on uninstall. Signed-off-by: Jonathan Rajotte Signed-off-by: Mathieu Desnoyers --- liblttng-ust-python-agent/Makefile.am | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/liblttng-ust-python-agent/Makefile.am b/liblttng-ust-python-agent/Makefile.am index f80b8a3f..e2a15f48 100644 --- a/liblttng-ust-python-agent/Makefile.am +++ b/liblttng-ust-python-agent/Makefile.am @@ -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) -- 2.34.1