From: Jonathan Rajotte <jonathan.rajotte-julien@efficios.com>
Date: Fri, 16 Oct 2015 19:07:31 +0000 (-0400)
Subject: Fix python agent build/install/uninstall with DESTDIR specified
X-Git-Tag: v2.7.1~4
X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=044a659dc04c796c6f552a1198e21656769b9f57;p=lttng-ust.git

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 <jonathan.rajotte-julien@efficios.com>
Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
---

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)