From ab063cf96779c521618c022d4f669f69e3d9cc8f Mon Sep 17 00:00:00 2001 From: Adam Jackson Date: Mon, 26 Mar 2018 18:42:54 -0400 Subject: [PATCH] meson: Fix installing protocol.txt One fix the constructed path, two actually install it. Signed-off-by: Adam Jackson Reviewed-by: Keith Packard --- dix/meson.build | 5 +++++ meson.build | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dix/meson.build b/dix/meson.build index 66bd84d9e..0ed4f8210 100644 --- a/dix/meson.build +++ b/dix/meson.build @@ -44,3 +44,8 @@ libxserver_main = static_library('libxserver_main', include_directories: inc, dependencies: common_dep, ) + +install_data( + 'protocol.txt', + install_dir: serverconfigdir, +) diff --git a/meson.build b/meson.build index 47385ab03..216086ef2 100644 --- a/meson.build +++ b/meson.build @@ -462,7 +462,7 @@ glx_inc = include_directories('glx') top_srcdir_inc = include_directories('.') -serverconfigdir = join_paths(get_option('libdir'), '/xorg') +serverconfigdir = join_paths(get_option('libdir'), 'xorg') # Include must come first, as it sets up dix-config.h subdir('include')