diff options
| author | David Zeuthen <davidz@redhat.com> | 2012-05-23 17:11:29 -0400 |
|---|---|---|
| committer | David Zeuthen <davidz@redhat.com> | 2012-05-23 17:11:29 -0400 |
| commit | 6fbcc6cd839680fcefd81c4a43676e7c031c9859 (patch) | |
| tree | 68a0812d8e108cbe5df98444599298690ba7781d /src/polkitagent | |
| parent | 56293fa41d4f04d5261056491451f4cb80b16e11 (diff) | |
| download | polkit-6fbcc6cd839680fcefd81c4a43676e7c031c9859.tar.gz | |
Store private binaries in /usr/lib/polkit-1 instead of /usr/libexec
Signed-off-by: David Zeuthen <davidz@redhat.com>
Diffstat (limited to 'src/polkitagent')
| -rw-r--r-- | src/polkitagent/Makefile.am | 10 | ||||
| -rw-r--r-- | src/polkitagent/polkitagentsession.c | 2 |
2 files changed, 7 insertions, 5 deletions
diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am index e8c9fb1..1cfb73c 100644 --- a/src/polkitagent/Makefile.am +++ b/src/polkitagent/Makefile.am @@ -5,6 +5,7 @@ INCLUDES = \ -I$(top_srcdir)/src \ -I$(top_builddir)/src/polkit \ -I$(top_srcdir)/src/polkit \ + -DPACKAGE_PREFIX=\""$(prefix)"\" \ -DPACKAGE_LIBEXEC_DIR=\""$(libexecdir)"\" \ -DPACKAGE_SYSCONF_DIR=\""$(sysconfdir)"\" \ -DPACKAGE_DATA_DIR=\""$(datadir)"\" \ @@ -77,7 +78,8 @@ libpolkit_agent_1_la_LIBADD = \ libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)' -libexec_PROGRAMS = polkit-agent-helper-1 +libprivdir = $(prefix)/lib/polkit-1 +libpriv_PROGRAMS = polkit-agent-helper-1 polkit_agent_helper_1_SOURCES = \ polkitagenthelperprivate.c polkitagenthelperprivate.h \ @@ -132,9 +134,9 @@ endif # HAVE_INTROSPECTION # authenticate not only the invoking user, but possibly also root # and/or other users. # -install-exec-hook: - -chown root $(DESTDIR)$(libexecdir)/polkit-agent-helper-1 - -chmod 4755 $(DESTDIR)$(libexecdir)/polkit-agent-helper-1 +install-data-hook: + -chown root $(DESTDIR)$(libprivdir)/polkit-agent-helper-1 + -chmod 4755 $(DESTDIR)$(libprivdir)/polkit-agent-helper-1 EXTRA_DIST = polkitagentmarshal.list polkitagentenumtypes.h.template polkitagentenumtypes.c.template diff --git a/src/polkitagent/polkitagentsession.c b/src/polkitagent/polkitagentsession.c index 8129cd9..1c7a2dc 100644 --- a/src/polkitagent/polkitagentsession.c +++ b/src/polkitagent/polkitagentsession.c @@ -620,7 +620,7 @@ polkit_agent_session_initiate (PolkitAgentSession *session) goto error; } - helper_argv[0] = PACKAGE_LIBEXEC_DIR "/polkit-agent-helper-1"; + helper_argv[0] = PACKAGE_PREFIX "/lib/polkit-1/polkit-agent-helper-1"; helper_argv[1] = passwd->pw_name; helper_argv[2] = session->cookie; helper_argv[3] = NULL; |