diff options
| author | Jan Rybar <jrybar@redhat.com> | 2021-04-13 16:56:11 +0000 |
|---|---|---|
| committer | Jan Rybar <jrybar@redhat.com> | 2021-04-13 16:56:11 +0000 |
| commit | 7dd61b9ccf44a4811ae1257d9ff4fecfd40894bd (patch) | |
| tree | d39df4d83361122ef2395867010145eff34367d8 /src/polkitbackend | |
| parent | 2c8287fbd55c5d092370428a1bdbbf0a9fd7d537 (diff) | |
Revert "Merge branch 'pwithnall/polkit-51-usr-local-share-is-my-homeboy' into 'master'"revert-2c8287fb
This reverts merge request !75
Diffstat (limited to 'src/polkitbackend')
| -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, 2 insertions, 8 deletions
diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am index ae01965..7e3c080 100644 --- a/src/polkitbackend/Makefile.am +++ b/src/polkitbackend/Makefile.am @@ -15,7 +15,6 @@ AM_CPPFLAGS = \ -DPACKAGE_LOCALSTATE_DIR=\""$(localstatedir)"\" \ -DPACKAGE_LOCALE_DIR=\""$(localedir)"\" \ -DPACKAGE_LIB_DIR=\""$(libdir)"\" \ - -DPACKAGE_PREFIX=\""$(prefix)"\" \ -D_POSIX_PTHREAD_SEMANTICS \ -D_REENTRANT \ $(NULL) @@ -114,9 +113,6 @@ 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 65f1910..93c3c34 100644 --- a/src/polkitbackend/meson.build +++ b/src/polkitbackend/meson.build @@ -29,7 +29,6 @@ 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 ba3983d..ca17108 100644 --- a/src/polkitbackend/polkitbackendjsauthority.cpp +++ b/src/polkitbackend/polkitbackendjsauthority.cpp @@ -535,10 +535,9 @@ polkit_backend_js_authority_constructed (GObject *object) if (authority->priv->rules_dirs == NULL) { - authority->priv->rules_dirs = g_new0 (gchar *, 4); + authority->priv->rules_dirs = g_new0 (gchar *, 3); authority->priv->rules_dirs[0] = g_strdup (PACKAGE_SYSCONF_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->rules_dirs[1] = g_strdup (PACKAGE_DATA_DIR "/polkit-1/rules.d"); } authority->priv->rkt_context = g_main_context_new (); |