From a19489541ca9367e45b66d0a7b3fd86d445f74d2 Mon Sep 17 00:00:00 2001 From: Max Audron Date: Sun, 21 Feb 2021 14:16:16 +0100 Subject: [PATCH] meson: include build directory no matter it's name when updating the ebuild i noticed that the include for the config.h and version.h files relied on the build directory being name "build". This is fixed now by using the last segment of the meson.build_root() output which is the correct build dir. also delete no longer needed manual creation of version.h and config.h --- meson.build | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/meson.build b/meson.build index a277ee7f..1a1841ea 100644 --- a/meson.build +++ b/meson.build @@ -9,8 +9,6 @@ dbus_base_path = '/org/ladish' git_version = run_command(['git', 'rev-parse', '--short', 'HEAD']).stdout().strip() -run_command(['touch', 'build/version.h', 'build/config.h']) - configure_file(output : 'version.h', configuration : { 'GIT_VERSION' : '"@0@"'.format(git_version) @@ -31,7 +29,7 @@ configure_file(output : 'config.h', cc = meson.get_compiler('c') -inc = include_directories('build') +inc = include_directories(meson.build_root().split('/')[-1]) lash_inc = include_directories('lash_compat/liblash') dbus_dep = dependency('dbus-1')