[at-spi2-core: 1/4] Fix path where atk's generated headers are installed




commit 723ad21be5a73bd7cd1016dbfdbe1ef0c7aa6c11
Author: Federico Mena Quintero <federico gnome org>
Date:   Tue May 31 17:42:29 2022 -0500

    Fix path where atk's generated headers are installed
    
    atspi/meson.build redefines atspi_includedir, so it was being used for
    atk's paths.

 atk/meson.build | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
---
diff --git a/atk/meson.build b/atk/meson.build
index f3e37378..e99160e3 100644
--- a/atk/meson.build
+++ b/atk/meson.build
@@ -80,10 +80,12 @@ atk_version_conf.set('ATK_INTERFACE_AGE', atk_interface_age)
 atk_version_conf.set('LT_CURRENT_MINUS_AGE', '0')
 atk_version_conf.set('ATK_VERSION', atk_version)
 
+atk_includedir = join_paths(get_option('prefix'), get_option('includedir'))
+
 atk_version_h = configure_file(input: 'atkversion.h.in',
   output: 'atkversion.h',
   configuration: atk_version_conf,
-  install_dir: join_paths(atspi_includedir, atk_api_path),
+  install_dir: join_paths(atk_includedir, atk_api_path),
 )
 
 # Marshallers
@@ -98,7 +100,7 @@ atk_enums = gnome.mkenums('atk-enum-types',
   sources: atk_headers,
   c_template: 'atk-enum-types.c.template',
   h_template: 'atk-enum-types.h.template',
-  install_dir: join_paths(atspi_includedir, atk_api_path),
+  install_dir: join_paths(atk_includedir, atk_api_path),
   install_header: true,
 )
 atk_enum_h = atk_enums[1]


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]