Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
7
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
polkit
polkit
Commits
265f0d54
Commit
265f0d54
authored
Jan 05, 2021
by
Jan Rybar
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'mbiebl/polkit-dbus-policy' into 'master'
Mbiebl/polkit dbus policy See merge request
!72
parents
d05a1677
273357a3
Pipeline
#251443
passed with stage
in 2 minutes and 16 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
data/Makefile.am
data/Makefile.am
+1
-1
meson.build
meson.build
+2
-2
No files found.
data/Makefile.am
View file @
265f0d54
...
@@ -15,7 +15,7 @@ $(service_DATA): $(service_in_files) Makefile
...
@@ -15,7 +15,7 @@ $(service_DATA): $(service_in_files) Makefile
# ----------------------------------------------------------------------------------------------------
# ----------------------------------------------------------------------------------------------------
dbusconfdir
=
$(
sysconf
dir)
/dbus-1/system.d
dbusconfdir
=
$(
data
dir)
/dbus-1/system.d
dbusconf_in_files
=
org.freedesktop.PolicyKit1.conf.in
dbusconf_in_files
=
org.freedesktop.PolicyKit1.conf.in
dbusconf_DATA
=
$(dbusconf_in_files:.conf.in=.conf)
dbusconf_DATA
=
$(dbusconf_in_files:.conf.in=.conf)
...
...
meson.build
View file @
265f0d54
...
@@ -129,8 +129,8 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin
...
@@ -129,8 +129,8 @@ assert(cc.has_function('XML_ParserCreate', dependencies: expat_dep), 'Can\'t fin
mozjs_dep = dependency('mozjs-78')
mozjs_dep = dependency('mozjs-78')
dbus_dep = dependency('dbus-1')
dbus_dep = dependency('dbus-1')
dbus_
sys
confdir = dbus_dep.get_pkgconfig_variable('
sysconf
dir', define_variable: ['
sysconf
dir', pk_prefix / pk_
sysconfdir])
dbus_confdir = dbus_dep.get_pkgconfig_variable('
data
dir', define_variable: ['
data
dir', pk_prefix / pk_
datadir]) #changed from sysconfdir with respect to commit#8eada3836465838
dbus_policydir = dbus_
sys
confdir / 'dbus-1/system.d'
dbus_policydir = dbus_confdir / 'dbus-1/system.d'
dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir])
dbus_system_bus_services_dir = dbus_dep.get_pkgconfig_variable('system_bus_services_dir', define_variable: ['datadir', pk_prefix / pk_datadir])
# check OS
# check OS
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment