diff options
| -rw-r--r-- | configure.ac | 1 | ||||
| -rw-r--r-- | src/backlight.c | 6 | ||||
| -rw-r--r-- | tools/Makefile.am | 9 | ||||
| -rw-r--r-- | tools/org.x.xf86-video-intel.backlight-helper.policy.in | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/configure.ac b/configure.ac index 7eb98931..18c1d2b4 100644 --- a/configure.ac +++ b/configure.ac @@ -701,6 +701,7 @@ DRIVER_NAME="intel" AC_SUBST([DRIVER_NAME]) AC_SUBST([moduledir]) AC_DEFINE_DIR([PREFIX_PATH], prefix, [installation prefix]) +AC_DEFINE_DIR([LIBEXEC_PATH], libexecdir, [libexec directory]) AC_CONFIG_FILES([ Makefile diff --git a/src/backlight.c b/src/backlight.c index cec0ceb8..b04b5f79 100644 --- a/src/backlight.c +++ b/src/backlight.c @@ -199,7 +199,7 @@ static int __backlight_helper_init(struct backlight *b, char *iface) * Either way, we have to trust that it is our backlight-helper * that is run and that we have scrutinised it carefully. */ - if (stat(PREFIX_PATH "/libexec/xf86-video-intel-backlight-helper", &st)) + if (stat(LIBEXEC_PATH "/xf86-video-intel-backlight-helper", &st)) return 0; if ((st.st_mode & (S_IFREG | S_ISUID | S_IXUSR)) != (S_IFREG | S_ISUID | S_IXUSR)) { @@ -219,10 +219,10 @@ static int __backlight_helper_init(struct backlight *b, char *iface) close(fds[0]); if (use_pkexec) { execlp("pkexec", "pkexec", - PREFIX_PATH "/libexec/xf86-video-intel-backlight-helper", + LIBEXEC_PATH "/xf86-video-intel-backlight-helper", iface, (char *)0); } else { - execle(PREFIX_PATH "/libexec/xf86-video-intel-backlight-helper", + execle(LIBEXEC_PATH "/xf86-video-intel-backlight-helper", "xf86-video-intel-backlight-helper", iface, (char *)0, env); } diff --git a/tools/Makefile.am b/tools/Makefile.am index a5667f34..876e1b03 100644 --- a/tools/Makefile.am +++ b/tools/Makefile.am @@ -24,7 +24,6 @@ AM_CFLAGS = \ $(NULL) drivermandir = $(DRIVER_MAN_DIR) -backlight_helperdir = $(prefix)/libexec policydir = $(datarootdir)/polkit-1/actions if BUILD_TOOLS @@ -33,12 +32,12 @@ driverman_DATA = intel-virtual-output.$(DRIVER_MAN_SUFFIX) endif if BUILD_BACKLIGHT_HELPER -backlight_helper_PROGRAMS = xf86-video-intel-backlight-helper +libexec_PROGRAMS = xf86-video-intel-backlight-helper nodist_policy_DATA = org.x.xf86-video-intel.backlight-helper.policy -backlight_helper = $(backlight_helperdir)/xf86-video-intel-backlight-helper -install-data-hook: - -chown root $(backlight_helper) && chmod u+s $(backlight_helper) +backlight_helper = $(libexecdir)/xf86-video-intel-backlight-helper +install-exec-hook: + -chown root $(DESTDIR)$(backlight_helper) && chmod u+s $(DESTDIR)$(backlight_helper) endif intel_virtual_output_CFLAGS = \ diff --git a/tools/org.x.xf86-video-intel.backlight-helper.policy.in b/tools/org.x.xf86-video-intel.backlight-helper.policy.in index 37e96226..96e772d4 100644 --- a/tools/org.x.xf86-video-intel.backlight-helper.policy.in +++ b/tools/org.x.xf86-video-intel.backlight-helper.policy.in @@ -14,6 +14,6 @@ <allow_inactive>no</allow_inactive> <allow_active>yes</allow_active> </defaults> - <annotate key="org.freedesktop.policykit.exec.path">@prefix@/libexec/xf86-video-intel-backlight-helper</annotate> + <annotate key="org.freedesktop.policykit.exec.path">@LIBEXEC_PATH@/xf86-video-intel-backlight-helper</annotate> </action> </policyconfig> |