From f83ad3f3ef30e202c1d74b5bbd362fafd46726f2 Mon Sep 17 00:00:00 2001 From: Danilo Spinella Date: Tue, 3 Apr 2018 16:01:59 +0200 Subject: [PATCH] Install include directory into includedir Follow includedir parameter when installing include directory. --- include/wlr/meson.build | 5 +++-- meson.build | 4 +++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/include/wlr/meson.build b/include/wlr/meson.build index 6a0843f78..6259c3118 100644 --- a/include/wlr/meson.build +++ b/include/wlr/meson.build @@ -9,5 +9,6 @@ version_data.set('WLR_VERSION_API_CURRENT', so_version[0]) version_data.set('WLR_VERSION_API_REVISION', so_version[1]) version_data.set('WLR_VERSION_API_AGE', so_version[2]) -configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data) -configure_file(output: 'version.h', install_dir: 'include/wlr', configuration: version_data) +wlr_inc_dest = join_paths(get_option('includedir'), 'wlr') +configure_file(output: 'config.h', install_dir: wlr_inc_dest, configuration: conf_data) +configure_file(output: 'version.h', install_dir: wlr_inc_dest, configuration: version_data) diff --git a/meson.build b/meson.build index 0d8fbe585..19d334e37 100644 --- a/meson.build +++ b/meson.build @@ -125,8 +125,10 @@ if get_option('enable-xwayland') else exclude_headers += 'xwayland.h' endif + +includedir = get_option('includedir') exclude_headers += 'meson.build' -install_subdir('include/wlr', install_dir: 'include', exclude_files: exclude_headers) +install_subdir('include/wlr', install_dir: includedir, exclude_files: exclude_headers) subdir('include')