From e38c573af8e6d53fc45045529c7e228fba00a2b1 Mon Sep 17 00:00:00 2001 From: Michael Leibowitz Date: Tue, 19 Nov 2013 09:52:41 -0800 Subject: [PATCH] prefix/lib/polkit -> libdir/polkit Fixes systems where /lib64 is used Signed-off-by: Michael Leibowitz --- configure.ac | 2 +- data/Makefile.am | 2 +- src/polkitagent/Makefile.am | 2 +- src/polkitagent/polkitagentsession.c | 2 +- src/polkitbackend/Makefile.am | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 4bb6d90..f836c85 100644 --- a/configure.ac +++ b/configure.ac @@ -566,7 +566,7 @@ echo " " -echo "NOTE: The file ${prefix}/lib/polkit-1/polkit-agent-helper-1 must be owned" +echo "NOTE: The file ${libdir}/polkit-1/polkit-agent-helper-1 must be owned" echo " by root and have mode 4755 (setuid root binary)" echo diff --git a/data/Makefile.am b/data/Makefile.am index 426dc33..d69e085 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,7 @@ NULL = -libprivdir = $(prefix)/lib/polkit-1 +libprivdir = $(libdir)/polkit-1 # ---------------------------------------------------------------------------------------------------- diff --git a/src/polkitagent/Makefile.am b/src/polkitagent/Makefile.am index 3bc364e..fb667d1 100644 --- a/src/polkitagent/Makefile.am +++ b/src/polkitagent/Makefile.am @@ -78,7 +78,7 @@ libpolkit_agent_1_la_LIBADD = \ libpolkit_agent_1_la_LDFLAGS = -export-symbols-regex '(^polkit_.*)' -libprivdir = $(prefix)/lib/polkit-1 +libprivdir = $(libdir)/polkit-1 libpriv_PROGRAMS = polkit-agent-helper-1 polkit_agent_helper_1_SOURCES = \ diff --git a/src/polkitagent/polkitagentsession.c b/src/polkitagent/polkitagentsession.c index 1c7a2dc..0090da6 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_PREFIX "/lib/polkit-1/polkit-agent-helper-1"; + helper_argv[0] = PACKAGE_LIB_DIR "/polkit-1/polkit-agent-helper-1"; helper_argv[1] = passwd->pw_name; helper_argv[2] = session->cookie; helper_argv[3] = NULL; diff --git a/src/polkitbackend/Makefile.am b/src/polkitbackend/Makefile.am index 9f430d0..b3af2f4 100644 --- a/src/polkitbackend/Makefile.am +++ b/src/polkitbackend/Makefile.am @@ -67,7 +67,7 @@ rules_DATA = 50-default.rules # ---------------------------------------------------------------------------------------------------- -libprivdir = $(prefix)/lib/polkit-1 +libprivdir = $(libdir)/polkit-1 libpriv_PROGRAMS = polkitd polkitd_SOURCES = \ -- 2.7.4