[gnome-terminal/gnome-43] prefs: Move prefs binary to libexecdir

[Christian Persch <chpe src gnome org>]

commit 5c0167980b9f35b4148d410c12cc49ecf307b664
Author: Christian Persch <chpe src gnome org>
Date:   Sun Sep 18 16:04:46 2022 +0200

    prefs: Move prefs binary to libexecdir
    
    For FHS compliance, move the prefs binary from pkglibdir to libexecdir.
    
    Fixes: https://gitlab.gnome.org/GNOME/gnome-terminal/-/issues/7927
    (cherry picked from commit d69297f003c519b0cdb06d4115a6539297793910)

 src/meson.build                | 2 +-
 src/terminal-prefs-process.cc  | 2 +-
 src/terminal-settings-utils.cc | 2 +-
 src/terminal.cc                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/meson.build b/src/meson.build
index 726c4cdd..41a215f3 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -337,7 +337,7 @@ prefs_main = executable(
   include_directories: prefs_main_incs,
   dependencies: prefs_main_deps,
   install: true,
-  install_dir: gt_prefix / gt_pkglibdir,
+  install_dir: gt_prefix / gt_libexecdir,
   sources: prefs_main_sources,
 )
 
diff --git a/src/terminal-prefs-process.cc b/src/terminal-prefs-process.cc
index e06b17fa..a19386f0 100644
--- a/src/terminal-prefs-process.cc
+++ b/src/terminal-prefs-process.cc
@@ -255,7 +255,7 @@ terminal_prefs_process_initable_init(GInitable* initable,
   socket_fds[1] = -1;
 
   gs_free auto exe = terminal_client_get_file_uninstalled(TERM_LIBEXECDIR,
-                                                          TERM_PKGLIBDIR,
+                                                          TERM_LIBEXECDIR,
                                                           TERMINAL_PREFERENCES_BINARY_NAME,
                                                           G_FILE_TEST_IS_EXECUTABLE);
 
diff --git a/src/terminal-settings-utils.cc b/src/terminal-settings-utils.cc
index f64d9cc6..60e7a9ae 100644
--- a/src/terminal-settings-utils.cc
+++ b/src/terminal-settings-utils.cc
@@ -557,7 +557,7 @@ terminal_g_settings_schema_source_get_default(void)
 #if defined(TERMINAL_SERVER)
                                               TERM_LIBEXECDIR,
 #elif defined(TERMINAL_PREFERENCES)
-                                              TERM_PKGLIBDIR,
+                                              TERM_LIBEXECDIR,
 #else
 #error Need to define installed location
 #endif
diff --git a/src/terminal.cc b/src/terminal.cc
index ea1836ee..ce6060fd 100644
--- a/src/terminal.cc
+++ b/src/terminal.cc
@@ -385,7 +385,7 @@ handle_show_preferences(TerminalOptions *options,
   // If that isn't possible, launch the prefs binary directly
   auto launcher = g_subprocess_launcher_new(GSubprocessFlags(0));
   gs_free auto exe = terminal_client_get_file_uninstalled(TERM_BINDIR,
-                                                          TERM_PKGLIBDIR,
+                                                          TERM_LIBEXECDIR,
                                                           TERMINAL_PREFERENCES_BINARY_NAME,
                                                           G_FILE_TEST_IS_EXECUTABLE);
   char *argv[2] = {exe, nullptr};