From 6fbcc6cd839680fcefd81c4a43676e7c031c9859 Mon Sep 17 00:00:00 2001
From: David Zeuthen <davidz@redhat.com>
Date: Wed, 23 May 2012 17:11:29 -0400
Subject: Store private binaries in /usr/lib/polkit-1 instead of /usr/libexec

Signed-off-by: David Zeuthen <davidz@redhat.com>
---
 data/Makefile.am                           | 6 ++++--
 data/org.freedesktop.PolicyKit1.service.in | 2 +-
 data/polkit.service.in                     | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 83bcc20..6623286 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,12 +2,14 @@
 
 NULL =
 
+libprivdir = $(prefix)/lib/polkit-1
+
 servicedir       = $(datadir)/dbus-1/system-services
 service_in_files = org.freedesktop.PolicyKit1.service.in
 service_DATA     = $(service_in_files:.service.in=.service)
 
 $(service_DATA): $(service_in_files) Makefile
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	@sed -e "s|\@libprivdir\@|$(libprivdir)|" $< > $@
 
 dbusconfdir = $(sysconfdir)/dbus-1/system.d
 dbusconf_DATA = org.freedesktop.PolicyKit1.conf
@@ -27,7 +29,7 @@ if HAVE_SYSTEMD
 systemdservicedir       = $(systemdsystemunitdir)
 systemdservice_DATA     = $(systemdservice_in_files:.service.in=.service)
 $(systemdservice_DATA): $(systemdservice_in_files) Makefile
-	@sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	@sed -e "s|\@libprivdir\@|$(libprivdir)|" $< > $@
 endif
 
 CLEANFILES = $(BUILT_SOURCES)
diff --git a/data/org.freedesktop.PolicyKit1.service.in b/data/org.freedesktop.PolicyKit1.service.in
index fbceb3f..10bbab0 100644
--- a/data/org.freedesktop.PolicyKit1.service.in
+++ b/data/org.freedesktop.PolicyKit1.service.in
@@ -1,5 +1,5 @@
 [D-BUS Service]
 Name=org.freedesktop.PolicyKit1
-Exec=@libexecdir@/polkitd --no-debug
+Exec=@libprivdir@/polkitd --no-debug
 User=root
 SystemdService=polkit.service
diff --git a/data/polkit.service.in b/data/polkit.service.in
index efd2948..9665043 100644
--- a/data/polkit.service.in
+++ b/data/polkit.service.in
@@ -5,4 +5,4 @@ Documentation=man:polkit(8)
 [Service]
 Type=dbus
 BusName=org.freedesktop.PolicyKit1
-ExecStart=@libexecdir@/polkitd --no-debug
+ExecStart=@libprivdir@/polkitd --no-debug
-- 
cgit v1.2.3