Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 1 | From 7938a5a760827aec737ea49d2f8719051abda188 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 |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 4 | Subject: [PATCH] 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> |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 15 | |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 16 | --- |
| 17 | lang/python/Makefile.am | 5 +++-- |
| 18 | 1 file changed, 3 insertions(+), 2 deletions(-) |
| 19 | |
| 20 | diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 21 | index bbb9111..cee499e 100644 |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 22 | --- a/lang/python/Makefile.am |
| 23 | +++ b/lang/python/Makefile.am |
Patrick Williams | 169d7bc | 2024-01-05 11:33:25 -0600 | [diff] [blame] | 24 | @@ -96,8 +96,9 @@ install-exec-local: |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 25 | build \ |
| 26 | --build-base="$$(basename "$${PYTHON}")-gpg" \ |
| 27 | install \ |
| 28 | - --prefix "$(DESTDIR)$(prefix)" \ |
| 29 | - --install-lib=$(DESTDIR)${pythondir} \ |
| 30 | + --root=${DESTDIR} \ |
| 31 | + --prefix "$(prefix)" \ |
| 32 | + --install-lib=${pythondir} \ |
| 33 | --verbose ; \ |
| 34 | done |
| 35 | |