One fix the constructed path, two actually install it.
Signed-off-by: Adam Jackson <a...@redhat.com>
---
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 66bd84d9ee..0ed4f82100 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 47385ab033..216086ef25 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')
--
2.16.2
_______________________________________________
xorg-devel@lists.x.org: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: https://lists.x.org/mailman/listinfo/xorg-devel
