Meson: install headers in hyprland subdir

hyprwm · May 10, 2024 · a336b9b · a336b9b
1 parent 411292d
commit a336b9b
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git 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
@@ -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
@@ -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,
 )