From 76ab6be0d02f82a95528e0d95ca2c80f85ecd39b Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 19 Feb 2014 22:39:39 -0600 Subject: Switch to pkglibexecdir --- data/Makefile.am | 4 ++-- data/indicator-keyboard.conf.in | 2 +- data/indicator-keyboard.desktop.in | 2 +- data/upstart/Makefile.am | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 91c94dfb..ae1d9b0f 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -47,7 +47,7 @@ upstart_jobsdir = $(datadir)/upstart/sessions/ upstart_jobs_DATA = indicator-keyboard.conf %.conf: %.conf.in - $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ ########################### # XDG Autostart File @@ -57,7 +57,7 @@ xdg_autostartdir = /etc/xdg/autostart xdg_autostart_DATA = indicator-keyboard.desktop %.desktop: %.desktop.in - $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ ########################### # Indicator Config diff --git a/data/indicator-keyboard.conf.in b/data/indicator-keyboard.conf.in index 0becdf09..737a4830 100644 --- a/data/indicator-keyboard.conf.in +++ b/data/indicator-keyboard.conf.in @@ -6,4 +6,4 @@ stop on desktop-end or indicator-services-end respawn respawn limit 2 10 -exec @libexecdir@/indicator-keyboard-service --use-gtk +exec @pkglibexecdir@/indicator-keyboard-service --use-gtk diff --git a/data/indicator-keyboard.desktop.in b/data/indicator-keyboard.desktop.in index 9c611160..fc55aa20 100644 --- a/data/indicator-keyboard.desktop.in +++ b/data/indicator-keyboard.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] Type=Application Name=Indicator Keyboard -Exec=@libexecdir@/indicator-keyboard-service +Exec=@pkglibexecdir@/indicator-keyboard-service OnlyShowIn=Unity; NoDisplay=true StartupNotify=false diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am index 3cf55624..c0b6a2eb 100644 --- a/data/upstart/Makefile.am +++ b/data/upstart/Makefile.am @@ -6,7 +6,7 @@ xdg_autostartdir = $(datadir)/upstart/xdg/autostart xdg_autostart_DATA = indicator-keyboard.desktop %.desktop: %.desktop.in - $(AM_V_GEN) sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ EXTRA_DIST = indicator-keyboard.desktop.in -- cgit v1.2.3