From 69e087caa4fdfcc303080c021ba463afcf4290c7 Mon Sep 17 00:00:00 2001 From: Olivier Fourdan Date: Fri, 5 Feb 2021 11:36:15 +0100 Subject: [PATCH] xwayland: Fix path in pkg-config with autoconf MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit When using autoconf/automake to build Xwayland, the actual path to Xwayland is not fully qualified and refers to the "exec_prefix". As a result, the path provided by the generated pkg-config file is wrong when using autoconf to build the Xserver. Fix the xwayland.pc file to also set the variable "prefix" and "exec_prefix" so that the path to Xwayland is fully resolved. Add those variables to the meson build as well for good measure. Signed-off-by: Olivier Fourdan Reviewed-by: Peter Hutterer Acked-by: Michel Dänzer --- hw/xwayland/meson.build | 2 ++ hw/xwayland/xwayland.pc.in | 3 +++ 2 files changed, 5 insertions(+) diff --git a/hw/xwayland/meson.build b/hw/xwayland/meson.build index e848daf0d..1dea64bff 100644 --- a/hw/xwayland/meson.build +++ b/hw/xwayland/meson.build @@ -137,6 +137,8 @@ xwayland_server = executable( ) xwayland_data = configuration_data() +xwayland_data.set('prefix', get_option('prefix')) +xwayland_data.set('exec_prefix', '${prefix}') xwayland_data.set('PACKAGE_VERSION', meson.project_version()) xwayland_data.set('xwayland_path', xwayland_path) xwayland_data.set('have_glamor', build_glamor ? 'true' : 'false') diff --git a/hw/xwayland/xwayland.pc.in b/hw/xwayland/xwayland.pc.in index c42435fb7..f6165a65b 100644 --- a/hw/xwayland/xwayland.pc.in +++ b/hw/xwayland/xwayland.pc.in @@ -1,3 +1,6 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ + Name: Xwayland Description: X Server for Wayland Version: @PACKAGE_VERSION@