From dd359a11a25e6aa082d405c56c5b1255cd844c76 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 21:31:05 -0600
Subject: Switch to using pkglibexecdir

---
 data/Makefile.am                              | 4 ++--
 data/indicator-application.conf.in            | 2 +-
 data/indicator-application.desktop.in         | 2 +-
 data/upstart/Makefile.am                      | 4 ++--
 data/upstart/indicator-application.desktop.in | 2 +-
 src/Makefile.am                               | 2 +-
 6 files changed, 8 insertions(+), 8 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;
diff --git a/src/Makefile.am b/src/Makefile.am
index a68c007..4174cbc 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -31,7 +31,7 @@ libapplication_la_LDFLAGS = $(COVERAGE_LDFLAGS) \
 # Service
 ##################################
 
-libexec_PROGRAMS = indicator-application-service
+pkglibexec_PROGRAMS = indicator-application-service
 
 BUILT_SOURCES += \
 	application-service-marshal.h \
-- 
cgit v1.2.3