From a336b9b1fb415433e849de002df68c45034d0419 Mon Sep 17 00:00:00 2001 From: Mihai Fufezan Date: Sat, 11 May 2024 00:25:28 +0300 Subject: [PATCH] Meson: install headers in hyprland subdir --- include/meson.build | 2 +- include/wlr/meson.build | 2 +- meson.build | 2 ++ 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/meson.build b/include/meson.build index e6698003..5c04c01c 100644 --- a/include/meson.build +++ b/include/meson.build @@ -25,7 +25,7 @@ if not features.get('session') endif install_subdir('wlr', - install_dir: get_option('includedir'), + install_dir: get_option('includedir') / 'hyprland', exclude_files: exclude_files, ) diff --git a/include/wlr/meson.build b/include/wlr/meson.build index f7ca413d..a8a5779b 100644 --- a/include/wlr/meson.build +++ b/include/wlr/meson.build @@ -22,4 +22,4 @@ ver_h = configure_file( configuration: version_data, ) -install_headers(conf_h, ver_h, subdir: 'wlr') +install_headers(conf_h, ver_h, install_dir: get_option('includedir') / 'hyprland' / 'wlr') diff --git a/meson.build b/meson.build index e1f690c3..3f4743a1 100644 --- a/meson.build +++ b/meson.build @@ -199,10 +199,12 @@ if get_option('examples') subdir('tinywl') endif +pkg_install_dir = join_paths(get_option('datadir'), 'pkgconfig') pkgconfig = import('pkgconfig') pkgconfig.generate( lib_wlr, description: 'Wayland compositor library', + install_dir: pkg_install_dir, url: 'https://gitlab.freedesktop.org/wlroots/wlroots', variables: wlr_vars, )