varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2026-02-12 16:10:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

preload: move to libdir from libexecdir

Browse Source 
This isn't an executable, it just belongs in libdir.
This commit is contained in:
Christian Hergert
2020-03-05 15:46:03 -08:00
parent 745eb981d1
commit a6c39af553
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
meson.build
View File

@ -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_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_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_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_TARNAME', 'PACKAGE_STRING')
config_h.set('PACKAGE', 'PACKAGE_NAME') config_h.set('PACKAGE', 'PACKAGE_NAME')
config_h.set('VERSION', 'PACKAGE_VERSION') config_h.set('VERSION', 'PACKAGE_VERSION')

2
src/libsysprof/preload/meson.build
View File

@ -15,5 +15,5 @@ libsysprof_memory_preload = shared_library('sysprof-memory-@0@'.format(libsyspro
libsysprof_memory_preload_sources, libsysprof_memory_preload_sources,
dependencies: libsysprof_memory_preload_deps, dependencies: libsysprof_memory_preload_deps,
install: true, install: true,
install_dir: get_option('libexecdir'), install_dir: get_option('libdir'),
) )

2
src/libsysprof/sysprof-memprof-source.c
View File

@ -40,7 +40,7 @@ sysprof_memprof_source_modify_spawn (SysprofSource *source,
#ifdef __linux__ #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; g_autofree gchar *freeme = NULL;
const gchar *ld_preload; const gchar *ld_preload;