proxmox-mirrors/fwupd
1
0
Fork 0
mirror of https://git.proxmox.com/git/fwupd synced 2025-08-03 16:44:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

meson: Bump dependency to 0.44 and adjust sysconfdir handling

Browse Source 
Some code was put in place to workaround sysconfdir behavior of meson
0.43 and less.  This is no longer needed.
This commit is contained in:
Mario Limonciello 2018-10-15 16:28:27 -05:00 committed by Richard Hughes
parent 860e99357b
commit 7e5c6eebfe
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/meson.build
View File

@ -38,7 +38,7 @@ if get_option('systemd')
rw_directories = []
rw_directories += join_paths (localstatedir, 'lib', 'fwupd')
rw_directories += join_paths (default_sysconfdir, 'fwupd', 'remotes.d')
rw_directories += join_paths (sysconfdir, 'fwupd', 'remotes.d')
if get_option('plugin_uefi')
rw_directories += ['-/boot/efi', '-/efi/EFI', '-/boot/EFI']
endif

8
meson.build
View File

@ -1,7 +1,7 @@
project('fwupd', 'c',
version : '1.2.0',
license : 'LGPL-2.1+',
meson_version : '>=0.43.0',
meson_version : '>=0.44.0',
default_options : ['warning_level=2', 'c_std=c99'],
)
@ -310,12 +310,6 @@ configure_file(
configuration : conf
)
default_sysconfdir = get_option('sysconfdir')
if default_sysconfdir == 'etc'
message('sysconfdir of etc makes no sense, using /etc')
default_sysconfdir = '/etc'
endif
plugin_deps = []
plugin_deps += appstream_glib
plugin_deps += gio