aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2014-02-19 21:31:05 -0600
committerTed Gould <ted@gould.cx>2014-02-19 21:31:05 -0600
commitdd359a11a25e6aa082d405c56c5b1255cd844c76 (patch)
tree581de932dcee36f2870d8ae577233648c5198b87 /data
parentf179a2c7f91497854fa787eb0c65e547a791f038 (diff)
downloadayatana-indicator-application-dd359a11a25e6aa082d405c56c5b1255cd844c76.tar.gz
ayatana-indicator-application-dd359a11a25e6aa082d405c56c5b1255cd844c76.tar.bz2
ayatana-indicator-application-dd359a11a25e6aa082d405c56c5b1255cd844c76.zip
Switch to using pkglibexecdir
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am4
-rw-r--r--data/indicator-application.conf.in2
-rw-r--r--data/indicator-application.desktop.in2
-rw-r--r--data/upstart/Makefile.am4
-rw-r--r--data/upstart/indicator-application.desktop.in2
5 files changed, 7 insertions, 7 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 6f46c2e..3f9f7ad 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -5,13 +5,13 @@ upstart_jobsdir = $(datadir)/upstart/sessions/
upstart_jobs_DATA = indicator-application.conf
%.conf: %.conf.in
- sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
xdg_autostartdir = /etc/xdg/autostart
xdg_autostart_DATA = indicator-application.desktop
%.desktop: %.desktop.in
- sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
overridedir = $(pkgdatadir)
override_DATA = ordering-override.keyfile
diff --git a/data/indicator-application.conf.in b/data/indicator-application.conf.in
index 15a318d..d3a103d 100644
--- a/data/indicator-application.conf.in
+++ b/data/indicator-application.conf.in
@@ -11,6 +11,6 @@ emits appindicators-start appindicators-end
respawn
respawn limit 2 10
-exec @libexecdir@/indicator-application-service
+exec @pkglibexecdir@/indicator-application-service
pre-stop exec initctl emit appindicators-end
diff --git a/data/indicator-application.desktop.in b/data/indicator-application.desktop.in
index 2783781..c724a0f 100644
--- a/data/indicator-application.desktop.in
+++ b/data/indicator-application.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Indicator Application
-Exec=@libexecdir@/indicator-application-service
+Exec=@pkglibexecdir@/indicator-application-service
StartupNotify=false
Terminal=false
OnlyShowIn=Unity;XFCE;
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
index a384c75..f7bc09e 100644
--- a/data/upstart/Makefile.am
+++ b/data/upstart/Makefile.am
@@ -1,9 +1,9 @@
-xdg_autostartdir = $(datadir)/upstart/xdg/autostart
+xdg_autostartdir = $(pkgdatadir)/upstart/xdg/autostart
xdg_autostart_DATA = indicator-application.desktop
%.desktop: %.desktop.in
- sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+ sed -e "s|\@libexecdir\@|$(pkglibexecdir)|" $< > $@
EXTRA_DIST = \
indicator-application.desktop.in
diff --git a/data/upstart/indicator-application.desktop.in b/data/upstart/indicator-application.desktop.in
index ee1c4a1..f4ba076 100644
--- a/data/upstart/indicator-application.desktop.in
+++ b/data/upstart/indicator-application.desktop.in
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Application
Name=Indicator Application
-Exec=@libexecdir@/indicator-application-service
+Exec=@pkglibexecdir@/indicator-application-service
StartupNotify=false
Terminal=false
OnlyShowIn=Unity;XFCE;