From 663cfcf3a8f2f84c048cb501e6c988a3f7b02d2c Mon Sep 17 00:00:00 2001 From: Alexander Larsson Date: Tue, 3 May 2016 10:27:36 +0200 Subject: Fix make check if uninstalled This uses various environment variables set during make check to find the trigger, bwrap and xdg-app-dbusproxy from the build/source dir rather than the installed location. --- app/xdg-app-builtins-build.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app') diff --git a/app/xdg-app-builtins-build.c b/app/xdg-app-builtins-build.c index ea49b47..91d9827 100644 --- a/app/xdg-app-builtins-build.c +++ b/app/xdg-app-builtins-build.c @@ -150,7 +150,7 @@ xdg_app_builtin_build (int argc, char **argv, GCancellable *cancellable, GError app_files = g_file_get_child (app_deploy, "files"); argv_array = g_ptr_array_new_with_free_func (g_free); - g_ptr_array_add (argv_array, g_strdup (HELPER)); + g_ptr_array_add (argv_array, g_strdup (xdg_app_get_bwrap ())); custom_usr = FALSE; usr = g_file_get_child (app_deploy, "usr"); @@ -220,7 +220,7 @@ xdg_app_builtin_build (int argc, char **argv, GCancellable *cancellable, GError g_ptr_array_add (argv_array, NULL); - if (!execve (HELPER, (char **)argv_array->pdata, envp)) + if (!execve (xdg_app_get_bwrap (), (char **)argv_array->pdata, envp)) { g_set_error (error, G_IO_ERROR, g_io_error_from_errno (errno), "Unable to start app"); return FALSE; -- cgit v1.2.1