Make meson.override_find_program working on more complex use cases

Add some missing `meson.override_find_program`

And make sure that the `.gir` we build are found when used uninstalled
as a concequence of `meson.override_find_program`.
This commit is contained in:
Thibault Saunier 2019-08-15 09:41:30 -04:00 committed by Thibault Saunier
parent e0f9f94a7e
commit ddaa2a9ec3

View File

@ -309,6 +309,10 @@ locate_gir (GIrParser *parser,
if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR)) if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
return path; return path;
g_free (path); g_free (path);
path = g_build_filename (UNINSTALLED_GIR_DIR, girname, NULL);
if (g_file_test (path, G_FILE_TEST_EXISTS | G_FILE_TEST_IS_REGULAR))
return path;
g_free (path);
return NULL; return NULL;
} }