| Andrew Geissler | fc113ea | 2023-03-31 09:59:46 -0500 | [diff] [blame] | 1 | From fc28149b6b198042c8d29e0931415adad7ed3231 Mon Sep 17 00:00:00 2001 |
| 2 | From: Wang Mingyu <wangmy@fujitsu.com> |
| 3 | Date: Thu, 16 Mar 2023 08:03:47 +0000 |
| 4 | Subject: [PATCH] Fix install conflict when enable multilib. |
| 5 | |
| 6 | Automake defines pythondir in terms of libdir (rather than hardcode 'lib' or query it from python as automake upstream does) |
| 7 | https://git.yoctoproject.org/poky/tree/meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch |
| 8 | |
| 9 | So libdir needs to be defined when pythondir is defined. |
| 10 | |
| 11 | Upstream-Status: Inappropriate |
| 12 | |
| 13 | Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> |
| 14 | --- |
| 15 | Makefile.am | 2 +- |
| 16 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 17 | |
| 18 | diff --git a/Makefile.am b/Makefile.am |
| 19 | index 8b57a83..580f5bc 100644 |
| 20 | --- a/Makefile.am |
| 21 | +++ b/Makefile.am |
| 22 | @@ -1,6 +1,6 @@ |
| 23 | SUBDIRS = src xcbgen |
| 24 | |
| 25 | -pkgconfigdir = $(datarootdir)/pkgconfig |
| 26 | +pkgconfigdir = $(libdir)/pkgconfig |
| 27 | pkgconfig_DATA = xcb-proto.pc |
| 28 | |
| 29 | EXTRA_DIST=doc xcb-proto.pc.in autogen.sh README.md |
| 30 | -- |
| 31 | 2.34.1 |
| 32 | |