From 3891bd9fd2b325d18d734b4de9c52a0162cebd3b Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@canonical.com>
Date: Wed, 9 Sep 2009 09:52:36 -0500
Subject: Putting the dbus service (correctly) in the libexec directory instead
 of the bin directory.

---
 configure.ac                       | 1 -
 data/Makefile.am                   | 6 ++++++
 data/indicator-messages.service.in | 2 +-
 src/Makefile.am                    | 2 +-
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 3cf72a7..e00a725 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,6 @@ AC_OUTPUT([
 Makefile
 src/Makefile
 data/Makefile
-data/indicator-messages.service
 data/icons/Makefile
 data/icons/16x16/Makefile
 data/icons/16x16/status/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
index 6177c6d..094a434 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -2,3 +2,9 @@ SUBDIRS = icons
 
 dbus_servicesdir = $(DBUSSERVICEDIR)
 dbus_services_DATA = indicator-messages.service
+
+%.service: %.service.in
+	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+EXTRA_DIST = indicator-messages.service.in
+
diff --git a/data/indicator-messages.service.in b/data/indicator-messages.service.in
index 9ae3960..573a2d6 100644
--- a/data/indicator-messages.service.in
+++ b/data/indicator-messages.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.ayatana.indicator.messages
-Exec=@prefix@/bin/indicator-messages-service
+Exec=@libexecdir@/indicator-messages-service
diff --git a/src/Makefile.am b/src/Makefile.am
index 38787a1..01741d0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 
-bin_PROGRAMS = indicator-messages-service
+libexec_PROGRAMS = indicator-messages-service
 
 ######################################
 # Building the messages indicator
-- 
cgit v1.2.3