diff options
| author | Jan Rybar <jrybar@redhat.com> | 2021-02-25 18:34:30 +0000 |
|---|---|---|
| committer | Jan Rybar <jrybar@redhat.com> | 2021-02-25 18:34:30 +0000 |
| commit | f1979ce4ceb34d1140e759ec920d0cd2532993d3 (patch) | |
| tree | 12b44b9e19ccb6f2a120ba16e6f8e055c970a258 /src | |
| parent | 6e8b2263200d5b95b88b26ab10adfb3d5eb66b6d (diff) | |
| download | polkit-f1979ce4ceb34d1140e759ec920d0cd2532993d3.tar.gz | |
test: Fix a typo in a comment
Signed-off-by: Philip Withnall <withnall@endlessm.com>
Diffstat (limited to 'src')
| -rw-r--r-- | src/polkitbackend/Makefile.am | 4 | ||||
| -rw-r--r-- | src/polkitbackend/meson.build | 1 | ||||
| -rw-r--r-- | src/polkitbackend/polkitbackendjsauthority.cpp | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am index 7e3c080..ae01965 100644 --- a/src/polkitbackend/Makefile.am +++ b/src/polkitbackend/Makefile.am @@ -15,6 +15,7 @@ AM_CPPFLAGS = \ -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ + -DPACKAGE_PREFIX=\""$(prefix)"\" \ -D_POSIX_PTHREAD_SEMANTICS \ -D_REENTRANT \ $(NULL) @@ -113,6 +114,9 @@ install-data-hook: mkdir -p $(DESTDIR)$(sysconfdir)/polkit-1/rules.d -chmod 700 $(DESTDIR)$(sysconfdir)/polkit-1/rules.d -chown $(POLKITD_USER) $(DESTDIR)$(sysconfdir)/polkit-1/rules.d + mkdir -p $(DESTDIR)$(prefix)/local/share/polkit-1/rules.d + -chmod 700 $(DESTDIR)$(prefix)/local/share/polkit-1/rules.d + -chown $(POLKITD_USER) $(DESTDIR)$(prefix)/local/share/polkit-1/rules.d mkdir -p $(DESTDIR)$(datadir)/polkit-1/rules.d -chmod 700 $(DESTDIR)$(datadir)/polkit-1/rules.d -chown $(POLKITD_USER) $(DESTDIR)$(datadir)/polkit-1/rules.d diff --git a/src/polkitbackend/meson.build b/src/polkitbackend/meson.build index 93c3c34..65f1910 100644 --- a/src/polkitbackend/meson.build +++ b/src/polkitbackend/meson.build @@ -29,6 +29,7 @@ c_flags = [ '-D_POLKIT_BACKEND_COMPILATION', '-DPACKAGE_DATA_DIR="@0@"'.format(pk_prefix / pk_datadir), '-DPACKAGE_SYSCONF_DIR="@0@"'.format(pk_prefix / pk_sysconfdir), + '-DPACKAGE_PREFIX="@0@"'.format(pk_prefix), ] if enable_logind diff --git a/src/polkitbackend/polkitbackendjsauthority.cpp b/src/polkitbackend/polkitbackendjsauthority.cpp index ca17108..ba3983d 100644 --- a/src/polkitbackend/polkitbackendjsauthority.cpp +++ b/src/polkitbackend/polkitbackendjsauthority.cpp @@ -535,9 +535,10 @@ polkit_backend_js_authority_constructed (GObject *object) if (authority->priv->rules_dirs == NULL) { - authority->priv->rules_dirs = g_new0 (gchar *, 3); + authority->priv->rules_dirs = g_new0 (gchar *, 4); authority->priv->rules_dirs[0] = g_strdup (PACKAGE_SYSCONF_DIR "/polkit-1/rules.d"); - authority->priv->rules_dirs[1] = g_strdup (PACKAGE_DATA_DIR "/polkit-1/rules.d"); + authority->priv->rules_dirs[1] = g_strdup (PACKAGE_PREFIX "/local/share/polkit-1/rules.d"); + authority->priv->rules_dirs[2] = g_strdup (PACKAGE_DATA_DIR "/polkit-1/rules.d"); } authority->priv->rkt_context = g_main_context_new (); |