Make efi_incdir fallback to includedir

* Remove the arbitrary /usr/include/efi

Signed-off-by: Callum Farmer <[email protected]>

efi/meson.build

@@ -23,6 +23,10 @@ endif
 efi_ldsdir = get_option('efi-ldsdir')
 efi_incdir = get_option('efi-includedir')
 
+if efi_incdir == ''
+  efi_incdir = join_paths(includedir, 'efi')
+endif
+
 gnu_efi_path_arch = ''
 foreach name : [gnu_efi_arch, EFI_MACHINE_TYPE_NAME]
   if (gnu_efi_path_arch == '' and name != '' and

meson.build

@@ -15,6 +15,7 @@ objcopy_version = run_command(objcopy, '--version', check: true).stdout().split(
 gnuefi = dependency('gnu-efi', version: '>= 3.0.18')
 prefix = get_option('prefix')
 libdir = join_paths(prefix, get_option('libdir'))
+includedir = join_paths(prefix, get_option('includedir'))
 libexecdir = join_paths(prefix, get_option('libexecdir'))
 
 genpeimg = find_program ('genpeimg', required: get_option('genpeimg'))

meson_options.txt

@@ -1,6 +1,6 @@
 option('efi-libdir', type : 'string', description : 'path to the EFI lib directory')
 option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory')
-option('efi-includedir', type : 'string', value : '/usr/include/efi', description : 'path to the EFI header directory')
+option('efi-includedir', type : 'string', description : 'path to the EFI header directory')
 option('efi_sbat_fwupd_generation', type : 'integer', value : 1, description : 'SBAT fwupd generation')
 option('efi_sbat_distro_id', type : 'string', value : '', description : 'SBAT distribution ID, e.g. fedora')
 option('efi_sbat_distro_summary', type : 'string', value : '', description : 'SBAT distribution summary, e.g. Fedora')