Merge tag 'v1.90.1' into tod

Tag 1.90.1

libfprint/meson.build

@@ -177,7 +177,7 @@ other_sources = []
 fp_enums = gnome.mkenums_simple('fp-enums',
     sources: libfprint_public_headers,
     install_header: true,
-    install_dir: get_option('includedir') / meson.project_name(),
+    install_dir: get_option('includedir') / versioned_libname,
 )
 fp_enums_h = fp_enums[1]
 
@@ -209,6 +209,10 @@ deps = [
     nss_dep,
 ]
 
+# These are empty and only exist so that the include directories are created
+# in the build tree. This silences a build time warning.
+subdir('nbis/include')
+subdir('nbis/libfprint-include')
 deps += declare_dependency(include_directories: [
     root_inc,
     include_directories('nbis/include'),
@@ -248,7 +252,7 @@ libfprint_drivers = static_library('fprint-drivers',
 mapfile = files('libfprint.ver')
 vflag = '-Wl,--version-script,@0@/@1@'.format(meson.source_root(), mapfile[0])
 
-libfprint = library('fprint',
+libfprint = library(versioned_libname.split('lib')[1],
     sources: [
         fp_enums,
         libfprint_sources,
@@ -272,7 +276,7 @@ libfprint_dep = declare_dependency(link_with: libfprint,
     ])
 
 install_headers(['fprint.h'] + libfprint_public_headers,
-    subdir: meson.project_name()
+    subdir: versioned_libname
 )
 
 libfprint_private_dep = declare_dependency(
@@ -292,7 +296,7 @@ udev_rules = executable('fprint-list-udev-rules',
 
 if get_option('udev_rules')
     custom_target('udev-rules',
-        output: '60-fprint-autosuspend.rules',
+        output: '60-@0@-autosuspend.rules'.format(versioned_libname),
         capture: true,
         command: [ udev_rules ],
         install: true,