xwayland: Fix path in pkg-config with autoconf
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 <ofourdan@redhat.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> Acked-by: Michel Dänzer <mdaenzer@redhat.com>
This commit is contained in:
parent
d7391f383d
commit
69e087caa4
|
@ -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')
|
||||
|
|
|
@ -1,3 +1,6 @@
|
|||
prefix=@prefix@
|
||||
exec_prefix=@exec_prefix@
|
||||
|
||||
Name: Xwayland
|
||||
Description: X Server for Wayland
|
||||
Version: @PACKAGE_VERSION@
|
||||
|
|
Loading…
Reference in New Issue
Block a user