frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

meson: Fix installing protocol.txt 

One fix the constructed path, two actually install it.

Signed-off-by: Adam Jackson <ajax@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
This commit is contained in:
Adam Jackson 2018-03-26 18:42:54 -04:00
parent e3baacacda
commit ab063cf967
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dix/meson.build
View File

@ -44,3 +44,8 @@ libxserver_main = static_library('libxserver_main',
include_directories: inc, include_directories: inc,
dependencies: common_dep, dependencies: common_dep,
) )
install_data(
'protocol.txt',
install_dir: serverconfigdir,
)

2
meson.build
View File

@ -462,7 +462,7 @@ glx_inc = include_directories('glx')
top_srcdir_inc = include_directories('.') 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 # Include must come first, as it sets up dix-config.h
subdir('include') subdir('include')