From 602a4d7fa7f1c20c6663c2902c0429d379e394c7 Mon Sep 17 00:00:00 2001 From: Tristan Partin Date: Fri, 28 Jul 2023 14:04:48 -0500 Subject: [PATCH] meson: remove unnecessary join_path() with get_option('prefix') Meson will expand the paths for you. --- meson.build | 4 ++-- src/sysprofd/meson.build | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index fa4e278b..49ab73d0 100644 --- a/meson.build +++ b/meson.build @@ -72,8 +72,8 @@ 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', 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_quoted('PACKAGE_LIBEXECDIR', get_option('libexecdir')) +config_h.set_quoted('PACKAGE_LIBDIR', 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/sysprofd/meson.build b/src/sysprofd/meson.build index 34901f44..7aea6631 100644 --- a/src/sysprofd/meson.build +++ b/src/sysprofd/meson.build @@ -20,7 +20,7 @@ sysprofd_sources = [ ipc_service_src, ] -pkglibexecdir = join_paths(get_option('prefix'), get_option('libexecdir')) +pkglibexecdir = get_option('libexecdir') sysprofd_deps = [ glib_dep,