varun-r-mallya/sysprof
1
0
Fork 0
mirror of https://github.com/varun-r-mallya/sysprof.git synced 2025-12-31 20:36:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "meson: remove unnecessary join_path() with get_option('prefix')"

Browse Source 
This reverts commit 602a4d7fa7.

You absolutely must have these paths expanded when in use in system files.
This commit is contained in:
Christian Hergert
2023-08-01 19:21:41 -07:00
parent 181963fb73
commit 95a3177623
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@ -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')

2
src/sysprofd/meson.build
View File

@ -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,