Skip to content

Commit

Permalink
meson.build: derive dbuspolicydir from libdbus datadir
Browse files Browse the repository at this point in the history
All other dbus directory locations are derived from libdbus pkg-config
variables.
The dbuspolicydir instead only used the 'datadir' which has a fixed
default and might thus not be valid on some distributions.

If the value cannot be obtained from pkg-config, the fallback remains
the same as before.

Fixes rauc#1479

Signed-off-by: Enrico Joerns <[email protected]>
  • Loading branch information
ejoerns committed Aug 8, 2024
1 parent f1ad676 commit 0327a8f
Showing 1 changed file with 3 additions and 1 deletion.
4 changes: 3 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
Expand Up @@ -227,9 +227,11 @@ if dbussystemservicedir == ''
endif
endif

dbusdatadir = dbusdep.get_variable(pkgconfig: 'datadir', default_value: datadir) / 'dbus-1'

dbuspolicydir = get_option('dbuspolicydir')
if dbuspolicydir == ''
dbuspolicydir = datadir / 'dbus-1' / 'system.d'
dbuspolicydir = dbusdatadir / 'system.d'
endif

dbusinterfacesdir = get_option('dbusinterfacesdir')
Expand Down

0 comments on commit 0327a8f

Please sign in to comment.