From a6c39af553901a641f604fe70dfa0ed86342d2b9 Mon Sep 17 00:00:00 2001
From: Christian Hergert <chergert@redhat.com>
Date: Thu, 5 Mar 2020 15:46:03 -0800
Subject: [PATCH] preload: move to libdir from libexecdir

This isn't an executable, it just belongs in libdir.
---
 meson.build                             | 1 +
 src/libsysprof/preload/meson.build      | 2 +-
 src/libsysprof/sysprof-memprof-source.c | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index a97e2cde..03bc4841 100644
--- a/meson.build
+++ b/meson.build
@@ -33,6 +33,7 @@ config_h.set_quoted('PACKAGE_VERSION', meson.project_version())
 config_h.set_quoted('PACKAGE_STRING', 'sysprof-' + meson.project_version())
 config_h.set_quoted('PACKAGE_BUGREPORT', 'https://bugzilla.gnome.org/enter_bug.cgi?product=sysprof')
 config_h.set_quoted('PACKAGE_LIBEXECDIR', join_paths(get_option('prefix'), get_option('libexecdir')))
+config_h.set_quoted('PACKAGE_LIBDIR', join_paths(get_option('prefix'), get_option('libdir')))
 config_h.set('PACKAGE_TARNAME', 'PACKAGE_STRING')
 config_h.set('PACKAGE', 'PACKAGE_NAME')
 config_h.set('VERSION', 'PACKAGE_VERSION')
diff --git a/src/libsysprof/preload/meson.build b/src/libsysprof/preload/meson.build
index 91b09a0e..0714f551 100644
--- a/src/libsysprof/preload/meson.build
+++ b/src/libsysprof/preload/meson.build
@@ -15,5 +15,5 @@ libsysprof_memory_preload = shared_library('sysprof-memory-@0@'.format(libsyspro
   libsysprof_memory_preload_sources,
   dependencies: libsysprof_memory_preload_deps,
        install: true,
-   install_dir: get_option('libexecdir'),
+   install_dir: get_option('libdir'),
 )
diff --git a/src/libsysprof/sysprof-memprof-source.c b/src/libsysprof/sysprof-memprof-source.c
index 895a28a0..790ba5ef 100644
--- a/src/libsysprof/sysprof-memprof-source.c
+++ b/src/libsysprof/sysprof-memprof-source.c
@@ -40,7 +40,7 @@ sysprof_memprof_source_modify_spawn (SysprofSource    *source,
 
 #ifdef __linux__
   {
-    static const gchar so_path[] = PACKAGE_LIBEXECDIR"/libsysprof-memory-"API_VERSION_S".so";
+    static const gchar so_path[] = PACKAGE_LIBDIR"/libsysprof-memory-"API_VERSION_S".so";
     g_autofree gchar *freeme = NULL;
     const gchar *ld_preload;