From 95a3177623353b2d43c0c846f11f457cfd96f0d1 Mon Sep 17 00:00:00 2001 From: Christian Hergert Date: Tue, 1 Aug 2023 19:21:41 -0700 Subject: [PATCH] Revert "meson: remove unnecessary join_path() with get_option('prefix')" This reverts commit 602a4d7fa7f1c20c6663c2902c0429d379e394c7. You absolutely must have these paths expanded when in use in system files. --- meson.build | 2 +- src/sysprofd/meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/meson.build b/meson.build index 8a129f16..f299e7e7 100644 --- a/meson.build +++ b/meson.build @@ -73,7 +73,7 @@ config_h.set_quoted('PACKAGE_NAME', 'sysprof') 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://gitlab.gnome.org/GNOME/sysprof/-/issues/new') -config_h.set_quoted('PACKAGE_LIBEXECDIR', 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', 'PACKAGE_NAME') diff --git a/src/sysprofd/meson.build b/src/sysprofd/meson.build index 7aea6631..34901f44 100644 --- a/src/sysprofd/meson.build +++ b/src/sysprofd/meson.build @@ -20,7 +20,7 @@ sysprofd_sources = [ ipc_service_src, ] -pkglibexecdir = get_option('libexecdir') +pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir')) sysprofd_deps = [ glib_dep,