meson: replace deprecated dep.get_pkgconfig_variable() with dep.get_variable()

This commit is contained in:
George Kiagiadakis 2021-10-15 12:12:20 +03:00
parent ca8d31141e
commit c444ebaae1
2 changed files with 7 additions and 7 deletions

View file

@ -4,9 +4,9 @@ if systemd.found()
# system service
if get_option('systemd-system-service')
systemd_system_unit_dir = systemd.get_pkgconfig_variable(
'systemdsystemunitdir',
define_variable : ['prefix', get_option('prefix')])
systemd_system_unit_dir = systemd.get_variable(
pkgconfig: 'systemdsystemunitdir',
pkgconfig_define: ['prefix', get_option('prefix')])
if get_option('systemd-system-unit-dir') != ''
systemd_system_unit_dir = get_option('systemd-system-unit-dir')
@ -17,9 +17,9 @@ if systemd.found()
# user service
if get_option('systemd-user-service')
systemd_user_unit_dir = systemd.get_pkgconfig_variable(
'systemduserunitdir',
define_variable : ['prefix', get_option('prefix')])
systemd_user_unit_dir = systemd.get_variable(
pkgconfig: 'systemduserunitdir',
pkgconfig_define: ['prefix', get_option('prefix')])
if get_option('systemd-user-unit-dir') != ''
systemd_user_unit_dir = get_option('systemd-user-unit-dir')

View file

@ -3,7 +3,7 @@ if valgrind.found()
glib_supp = get_option('glib-supp')
if glib_supp == ''
glib_supp = glib_dep.get_pkgconfig_variable('prefix')
glib_supp = glib_dep.get_variable(pkgconfig: 'prefix')
glib_supp = glib_supp / 'share' / 'glib-2.0' / 'valgrind' / 'glib.supp'
endif
if fs.is_file(glib_supp)