diff --git a/meson.build b/meson.build index fd9b2c9d9..f6a5366f7 100644 --- a/meson.build +++ b/meson.build @@ -234,13 +234,6 @@ config_h.set('HAVE_WACOM', host_is_linux_not_s390, config_h.set('BUILD_THUNDERBOLT', host_is_linux_not_s390, description: 'Define to 1 to build the Thunderbolt panel') -# Check for info panel -gnome_session_libexecdir = get_option('gnome_session_libexecdir') -if gnome_session_libexecdir == '' - gnome_session_libexecdir = control_center_libexecdir -endif - - gnome = import('gnome') i18n = import('i18n') pkg = import('pkgconfig') @@ -286,7 +279,6 @@ output += ' Options \n' output += ' Documentation .............................. ' + get_option('documentation').to_string() + '\n' output += ' Build Tests ................................ ' + get_option('tests').to_string() + '\n' output += ' Tracing .................................... ' + enable_tracing.to_string() + '\n' -output += ' gnome-session libexecdir ................... ' + gnome_session_libexecdir + '\n' output += ' Optimized .................................. ' + control_center_optimized.to_string() + '\n' output += ' Panels \n' output += ' GNOME Bluetooth (Bluetooth panel) .......... ' + host_is_linux_not_s390.to_string() + '\n' diff --git a/meson_options.txt b/meson_options.txt index a899033b0..b7a7c055c 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,6 +1,5 @@ option('cheese', type: 'boolean', value: true, description: 'build with cheese webcam support') option('documentation', type: 'boolean', value: false, description: 'build documentation') -option('gnome_session_libexecdir', type: 'string', value: '', description: 'Directory for gnome-session\'s libexecdir') option('ibus', type: 'boolean', value: true, description: 'build with IBus support') option('privileged_group', type: 'string', value: 'wheel', description: 'name of group that has elevated permissions') option('tests', type: 'boolean', value: true, description: 'build tests') diff --git a/panels/info-overview/cc-info-overview-panel.c b/panels/info-overview/cc-info-overview-panel.c index 8f8cb4769..780c1c947 100644 --- a/panels/info-overview/cc-info-overview-panel.c +++ b/panels/info-overview/cc-info-overview-panel.c @@ -238,7 +238,7 @@ static char * get_renderer_from_helper (const char **env) { int status; - char *argv[] = { GNOME_SESSION_DIR "/gnome-session-check-accelerated", NULL }; + char *argv[] = { LIBEXECDIR "/gnome-control-center-print-renderer", NULL }; g_auto(GStrv) envp = NULL; g_autofree char *renderer = NULL; g_autoptr(GError) error = NULL; diff --git a/panels/info-overview/meson.build b/panels/info-overview/meson.build index ff75e791e..abbaf3218 100644 --- a/panels/info-overview/meson.build +++ b/panels/info-overview/meson.build @@ -20,7 +20,7 @@ i18n.merge_file( cflags += [ '-DBINDIR="@0@"'.format(control_center_bindir), '-DDATADIR="@0@"'.format(control_center_datadir), - '-DGNOME_SESSION_DIR="@0@"'.format(gnome_session_libexecdir) + '-DLIBEXECDIR="@0@"'.format(control_center_libexecdir), ] sources = files(