File lightdm-use-pkglibexecdir.patch of Package lightdm
# HG changeset patch
# Parent 79422a3a63bcacbadbb7c27ced238711d5d318cb
Use pkglibexecdir instead of libexecdir for helper binaries/scripts
diff --git a/data/Makefile.am b/data/Makefile.am
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -12,7 +12,7 @@ apparmor_profiledir = $(sysconfdir)/appa
install-data-hook:
install -d $(DESTDIR)$(apparmor_profiledir)
- sed 's!LIBEXECDIR!$(libexecdir)!g' < $(srcdir)/guest-session.apparmor \
+ sed 's!PKGLIBEXECDIR!$(libexecdir)!g' < $(srcdir)/guest-session.apparmor \
> $(DESTDIR)$(apparmor_profiledir)/lightdm-guest-session
dist_man1_MANS = lightdm.1
diff --git a/data/guest-session.apparmor b/data/guest-session.apparmor
--- a/data/guest-session.apparmor
+++ b/data/guest-session.apparmor
@@ -4,7 +4,7 @@
#include <tunables/global>
-LIBEXECDIR/lightdm-guest-session-wrapper {
+PKGLIBEXECDIR/lightdm-guest-session-wrapper {
#include <abstractions/authentication>
#include <abstractions/nameservice>
#include <abstractions/wutmp>
diff --git a/src/Makefile.am b/src/Makefile.am
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -93,7 +93,7 @@ lightdm_LDADD = \
$(LIGHTDM_LIBS) \
-lpam
-libexec_PROGRAMS = lightdm-guest-session-wrapper
+pkglibexec_PROGRAMS = lightdm-guest-session-wrapper
lightdm_guest_session_wrapper_SOURCES = lightdm-guest-session-wrapper.c
diff --git a/src/display.c b/src/display.c
--- a/src/display.c
+++ b/src/display.c
@@ -474,7 +474,7 @@ create_session (Display *display, PAMSes
if (display->priv->autologin_guest)
{
gchar *t = command;
- command = g_strdup_printf (LIBEXEC_DIR "/lightdm-guest-session-wrapper %s", command);
+ command = g_strdup_printf (PKGLIBEXEC_DIR "/lightdm-guest-session-wrapper %s", command);
g_debug("Guest session, running session command through wrapper: %s", command);
g_free (t);
}
diff --git a/utils/Makefile.am b/utils/Makefile.am
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -1,5 +1,5 @@
bin_PROGRAMS = dm-tool
-libexec_PROGRAMS = lightdm-set-defaults
+pkglibexec_PROGRAMS = lightdm-set-defaults
dist_pkglibexec_SCRIPTS = gdmflexiserver
dm_tool_SOURCES = \