From c23bd2ab7a020fdbfbb3dd1ee0b3f5c8b5807253 Mon Sep 17 00:00:00 2001 From: Drew DeVault Date: Thu, 28 Dec 2017 14:38:52 -0500 Subject: [PATCH] Further fixes to header install dir --- include/wlr/meson.build | 5 ++--- meson.build | 3 +-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/include/wlr/meson.build b/include/wlr/meson.build index 84dc5ae9..6a0843f7 100644 --- a/include/wlr/meson.build +++ b/include/wlr/meson.build @@ -9,6 +9,5 @@ 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]) -header_install_dir = 'include/@0@/wlr'.format(meson.project_name()) -configure_file(output: 'config.h', install_dir: header_install_dir, configuration: conf_data) -configure_file(output: 'version.h', install_dir: header_install_dir, configuration: version_data) +configure_file(output: 'config.h', install_dir: 'include/wlr', configuration: conf_data) +configure_file(output: 'version.h', install_dir: 'include/wlr', configuration: version_data) diff --git a/meson.build b/meson.build index bacf6908..f6ffff40 100644 --- a/meson.build +++ b/meson.build @@ -97,8 +97,7 @@ else exclude_headers += 'xwm.h' endif exclude_headers += 'meson.build' -header_install_dir = 'include/@0@'.format('wlr') -install_subdir('include/wlr', install_dir: header_install_dir, exclude_files: exclude_headers) +install_subdir('include/wlr', install_dir: 'include', exclude_files: exclude_headers) subdir('include')