blob: 1471184d67535b9edb7f8b0076a51781ec5e3962 [file] [log] [blame]
Brad Bishop19323692019-04-05 15:28:33 -04001From ef920688bfe1c7328c9e97229d62ccd35304ad84 Mon Sep 17 00:00:00 2001
Brad Bishop316dfdd2018-06-25 12:45:53 -04002From: Hongxu Jia <hongxu.jia@windriver.com>
3Date: Wed, 31 Jan 2018 11:01:09 +0800
Brad Bishop1a4b7ee2018-12-16 17:11:34 -08004Subject: [PATCH 6/7] fix build path issue
Brad Bishop316dfdd2018-06-25 12:45:53 -04005
6Get the "--root" directory supplied to the "install" command,
7and use it as a prefix to strip off the purported filename
8encoded in bytecode files.
9
10Since --root added, we need to tweak --prefix and --install-lib
11to use relative path.
12
13Upstream-Status: Submitted [gnupg-devel@gnupg.org]
14Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com>
15---
16 lang/python/Makefile.am | 5 +++--
17 1 file changed, 3 insertions(+), 2 deletions(-)
18
19diff --git a/lang/python/Makefile.am b/lang/python/Makefile.am
Brad Bishop19323692019-04-05 15:28:33 -040020index 36c6f7b..ce9a108 100644
Brad Bishop316dfdd2018-06-25 12:45:53 -040021--- a/lang/python/Makefile.am
22+++ b/lang/python/Makefile.am
Brad Bishop19323692019-04-05 15:28:33 -040023@@ -92,8 +92,9 @@ install-exec-local:
Brad Bishop316dfdd2018-06-25 12:45:53 -040024 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 Bishop1a4b7ee2018-12-16 17:11:34 -0800362.7.4
Brad Bishop316dfdd2018-06-25 12:45:53 -040037