From 7e5c6eebfebd1f69a87a43a1cf987f465d5800b6 Mon Sep 17 00:00:00 2001 From: Mario Limonciello Date: Mon, 15 Oct 2018 16:28:27 -0500 Subject: [PATCH] meson: Bump dependency to 0.44 and adjust sysconfdir handling Some code was put in place to workaround sysconfdir behavior of meson 0.43 and less. This is no longer needed. --- data/meson.build | 2 +- meson.build | 8 +------- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/data/meson.build b/data/meson.build index 4f7c9c4d7..8dd2ac9ad 100644 --- a/data/meson.build +++ b/data/meson.build @@ -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 diff --git a/meson.build b/meson.build index 96d752aea..1f143c9d4 100644 --- a/meson.build +++ b/meson.build @@ -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