| Andrew Geissler | 5199d83 | 2021-09-24 16:47:35 -0500 | [diff] [blame] | 1 | From dd1fdc841d069dbd4e284f430a88af79de951124 Mon Sep 17 00:00:00 2001 | 
| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 2 | From: Robert Yang <liezhi.yang@windriver.com> | 
|  | 3 | Date: Thu, 26 Sep 2019 17:54:00 +0800 | 
|  | 4 | Subject: [PATCH] python-lttngust/Makefile.am: Add --install-lib to setup.py | 
|  | 5 |  | 
|  | 6 | Otherwise it may install to /usr/lib, but should be /usr/lib64 when cross | 
|  | 7 | building. | 
|  | 8 |  | 
|  | 9 | Upstream-Status: Submitted [https://github.com/lttng/lttng-ust/pull/59] | 
|  | 10 |  | 
|  | 11 | Signed-off-by: Robert Yang <liezhi.yang@windriver.com> | 
| Andrew Geissler | 5199d83 | 2021-09-24 16:47:35 -0500 | [diff] [blame] | 12 |  | 
| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 13 | --- | 
| Andrew Geissler | 5199d83 | 2021-09-24 16:47:35 -0500 | [diff] [blame] | 14 | src/python-lttngust/Makefile.am | 2 +- | 
| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 15 | 1 file changed, 1 insertion(+), 1 deletion(-) | 
|  | 16 |  | 
| Andrew Geissler | 5199d83 | 2021-09-24 16:47:35 -0500 | [diff] [blame] | 17 | diff --git a/src/python-lttngust/Makefile.am b/src/python-lttngust/Makefile.am | 
|  | 18 | index f95482d..f76d95b 100644 | 
|  | 19 | --- a/src/python-lttngust/Makefile.am | 
|  | 20 | +++ b/src/python-lttngust/Makefile.am | 
|  | 21 | @@ -32,7 +32,7 @@ install-exec-local: build-python-bindings.stamp | 
| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 22 | if [ "$(DESTDIR)" != "" ]; then \ | 
|  | 23 | opts="$$opts --root=$(DESTDIR)"; \ | 
|  | 24 | fi; \ | 
| Andrew Geissler | 5199d83 | 2021-09-24 16:47:35 -0500 | [diff] [blame] | 25 | -	$(PYTHON) $(builddir)/setup.py install $$opts; | 
|  | 26 | +	$(PYTHON) $(builddir)/setup.py install $$opts --install-lib=$(pythondir); | 
| Brad Bishop | 00e122a | 2019-10-05 11:10:57 -0400 | [diff] [blame] | 27 |  | 
|  | 28 | clean-local: | 
|  | 29 | rm -rf $(builddir)/build |