enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

revert e08edfc068 

revert meson: changed deprecated since 0.56 (0.58) method get_pkgconfig_variable() to get_variable()
This commit is contained in:
Dmitri Chudinov 2022-07-22 06:17:50 -07:00
parent e2584da7c1
commit 65f312e467
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dbus-services/meson.build
View File

@ -15,4 +15,4 @@ configure_file(
input: 'org.enlightenment.Ethumb.service.in',
output: 'org.enlightenment.Ethumb.service',
configuration: org_enlightenment_ethumb_service_config,
install_dir: dep.get_variable('session_bus_services_dir'))
install_dir: dep.get_pkgconfig_variable('session_bus_services_dir'))

4
meson.build
View File

@ -298,8 +298,8 @@ if sys_osx and get_option('lua-interpreter') == 'luajit'
# dependency with our arguments, a library later still needs to link to
# luajit for the pagesize argument thingy
lua = declare_dependency(
include_directories: include_directories(lua.get_variable('includedir')),
link_args: ['-L' + lua.get_variable('libdir'), '-l' + lua.get_variable('libname')]
include_directories: include_directories(lua.get_pkgconfig_variable('includedir')),
link_args: ['-L' + lua.get_pkgconfig_variable('libdir'), '-l' + lua.get_pkgconfig_variable('libname')]
)
endif

4
src/wayland_protocol/meson.build
View File

@ -22,13 +22,13 @@ wl_stable_protocol_sys = [
foreach sys_protocol : wl_unstable_protocol_sys
wl_protocol_local += [
join_paths(_wayland_protocols.get_variable('pkgdatadir'), 'unstable',
join_paths(_wayland_protocols.get_pkgconfig_variable('pkgdatadir'), 'unstable',
sys_protocol)]
endforeach
foreach sys_protocol : wl_stable_protocol_sys
wl_protocol_local += [
join_paths(_wayland_protocols.get_variable('pkgdatadir'), 'stable',
join_paths(_wayland_protocols.get_pkgconfig_variable('pkgdatadir'), 'stable',
sys_protocol)]
endforeach

2
systemd-services/meson.build
View File

@ -1,7 +1,7 @@
if get_option('systemd') == true
sys_dep = dependency('systemd', required: false)
if sys_dep.found()
sys_dir = sys_dep.get_variable('systemduserunitdir')
sys_dir = sys_dep.get_pkgconfig_variable('systemduserunitdir')
else
sys_dir = join_paths(dir_lib, 'systemd', 'user')
endif