[gdm: 3/11] meson: Use correct rules path when getting udevdir from pkg-config
- From: Ray Strode <halfline src gnome org>
 
- To: commits-list gnome org
 
- Cc: 
 
- Subject: [gdm: 3/11] meson: Use correct rules path when getting udevdir from pkg-config
 
- Date: Mon, 31 Aug 2020 13:28:03 +0000 (UTC)
 
commit 6629344831ce236c30000da02ffddd963c1a5ff3
Author: Marco Trevisan (TreviƱo) <marco ubuntu com>
Date:   Fri Aug 28 05:19:16 2020 +0200
    meson: Use correct rules path when getting udevdir from pkg-config
    
    When udev is installed we compute the udevdir from pkg-config, however that
    is only the parent folder of the rules.d, so in any case consider it a
    prefix.
 meson.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
---
diff --git a/meson.build b/meson.build
index 866e1fe9..08aa1aff 100644
--- a/meson.build
+++ b/meson.build
@@ -56,10 +56,11 @@ libselinux_dep = dependency('libselinux', required: get_option('selinux'))
 # udev
 if udev_dir == ''
   if udev_dep.found()
-    udev_dir = udev_dep.get_pkgconfig_variable('udevdir')
+    udev_prefix = udev_dep.get_pkgconfig_variable('udevdir')
   else
-    udev_dir = gdm_prefix / 'lib' / 'udev' / 'rules.d'
+    udev_prefix = gdm_prefix / 'lib' / 'udev'
   endif
+  udev_dir = udev_prefix / 'rules.d'
 endif
 
 # X11
[
Date Prev][
Date Next]   [
Thread Prev][
Thread Next]   
[
Thread Index]
[
Date Index]
[
Author Index]