[lttng-dev] [PATCH lttng-ust] Fix python agent build/install/uninstall with DESTDIR specified
Jonathan Rajotte
jonathan.rajotte-julien at efficios.com
Fri Oct 16 15:07:31 EDT 2015
Remove the install_files.txt record since it's simpler to delete the complete
folder on uninstall.
Signed-off-by: Jonathan Rajotte <jonathan.rajotte-julien at efficios.com>
---
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 f80b8a3..e2a15f4 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.1.4
More information about the lttng-dev
mailing list