| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 4f83750ce402b65d16cc09f8a0274a7ec76fc634 Mon Sep 17 00:00:00 2001 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 2 | From: Hongxu Jia <hongxu.jia@windriver.com> |
| 3 | Date: Wed, 31 Jan 2018 11:01:09 +0800 |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 4 | Subject: [PATCH 6/7] fix build path issue |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 5 | |
| 6 | Get the "--root" directory supplied to the "install" command, |
| 7 | and use it as a prefix to strip off the purported filename |
| 8 | encoded in bytecode files. |
| 9 | |
| 10 | Since --root added, we need to tweak --prefix and --install-lib |
| 11 | to use relative path. |
| 12 | |
| 13 | Upstream-Status: Submitted [gnupg-devel@gnupg.org] |
| 14 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 15 | --- |
| 16 | lang/python/Makefile.am | 5 +++-- |
| 17 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 18 | |
| 19 | diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am |
| 20 | index ce4f0a5..5a468f1 100644 |
| 21 | --- a/lang/python/Makefile.am |
| 22 | +++ b/lang/python/Makefile.am |
| 23 | @@ -90,8 +90,9 @@ install-exec-local: |
| 24 | build \ |
| 25 | --build-base="$$(basename "$${PYTHON}")-gpg" \ |
| 26 | install \ |
| 27 | - --prefix "$(DESTDIR)$(prefix)" \ |
| 28 | - --install-lib=$(DESTDIR)${pythondir} \ |
| 29 | + --root=${DESTDIR} \ |
| 30 | + --prefix "$(prefix)" \ |
| 31 | + --install-lib=${pythondir} \ |
| 32 | --verbose ; \ |
| 33 | done |
| 34 | |
| 35 | -- |
| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 36 | 2.7.4 |
| Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 37 | |