[PATCH xserver] meson: fix construction of SERVER_MISC_CONFIG_PATH

[Anthony Martin]

The Xorg server warns about a failure to open the protocol names file
on startup:

	[ 11467.061] (WW) Failed to open protocol names file lib/xorg/protocol.txt

The file name is incorrectly compiled into the binary as a relative path:

	% strings /usr/lib/Xorg | grep /protocol
	lib/xorg/protocol.txt
	Failed to open protocol names file lib/xorg/protocol.txt
	Invalid line in lib/xorg/protocol.txt, skipping
	%

This happens because the meson configuration does not add the build
environment prefix when constructing the preprocessor definition for
SERVER_MISC_CONFIG_PATH.

Adding the prefix is sufficient to silence the warning and add the
protocol names to the extension registry at startup.

Fixes: https://gitlab.freedesktop.org/xorg/xserver/issues/853
Signed-off-by: Anthony Martin <ality at pbrane.org>
---
 include/meson.build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/meson.build b/include/meson.build
index a01cb1709..7cd306ff0 100644
--- a/include/meson.build
+++ b/include/meson.build
@@ -107,7 +107,7 @@ conf_data.set('GLAMOR_HAS_GBM_LINEAR',
 conf_data.set('GBM_BO_WITH_MODIFIERS',
               build_glamor and gbm_dep.found() and gbm_dep.version().version_compare('>= 17.1'))
 
-conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', serverconfigdir)
+conf_data.set_quoted('SERVER_MISC_CONFIG_PATH', join_paths(get_option('prefix'), serverconfigdir))
 conf_data.set_quoted('PROJECTROOT', get_option('prefix'))
 conf_data.set_quoted('SYSCONFDIR', join_paths(get_option('prefix'), get_option('sysconfdir')))
 conf_data.set_quoted('SUID_WRAPPER_DIR', join_paths(get_option('prefix'), get_option('libexecdir')))
-- 
2.24.1