diff options
| author | Jan Alexander Steffens (heftig) <jan.steffens@gmail.com> | 2014-02-15 17:53:16 +0100 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2014-02-15 17:39:01 +0000 |
| commit | b71f3d8bd4d6773899c1bdc903911cf240e68ead (patch) | |
| tree | 38475ca50f0709e9adce821b52289282d2b372a8 /tools | |
| parent | 3d629c91cfa98b75c6685c2a2003e64fd1b612c4 (diff) | |
Backlight helper build fixes
Don't hardcode $(prefix)/libexec
Fix install hook when DESTDIR is set
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=75028
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.am | 9 | ||||
| -rw-r--r-- | tools/org.x.xf86-video-intel.backlight-helper.policy.in | 2 |
2 files changed, 5 insertions, 6 deletions
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> |