prefix/lib/polkit -> libdir/polkit

Fixes systems where /lib64 is used

Signed-off-by: Michael Leibowitz <michael.leibowitz@intel.com>

diff --git a/configure.ac b/configure.ac
index 4bb6d90b707a54e4d3e62fdb138a3840795cb14a..f836c8578dae89bbcea7d9c1cb9c25c1bb6e3b77 100644 (file)
--- 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 426dc33f025c7664bcdebb419101816e69d938f2..d69e08503cb9adc3d9d984c1f936ded4029a8b32 100644 (file)
--- 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 3bc364e5b02ad967a8b483dcd8c22e66c619b5c4..fb667d1bf031c09e62cc1ffabb84ee4f84ccc86c 100644 (file)
--- 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 1c7a2dc3959da739506e0fc814cd2c8c9b32f899..0090da638201e56a0482c83fdb8829ee6963f123 100644 (file)
--- 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 9f430d0d7e539c46b495b1018d691868309a091a..b3af2f430c72cf68c8a0d0192236d165905111b8 100644 (file)
--- 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 =                                                      \