From 79c89af3ac3c0c04f947c98b360a3ccaccbfc5dc Mon Sep 17 00:00:00 2001
From: Pete Woods <pete.woods@canonical.com>
Date: Tue, 20 Aug 2013 11:38:10 +0100
Subject: Re-do merge

---
 data/Makefile.am | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'data/Makefile.am')

diff --git a/data/Makefile.am b/data/Makefile.am
index 488ce05..45ff12f 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = icons
 
-dbus_servicesdir = $(DBUSSERVICEDIR)
+dbus_servicesdir = $(datadir)/dbus-1/services
 dbus_services_DATA = indicator-messages.service
 
 %.service: %.service.in
@@ -9,6 +9,9 @@ dbus_services_DATA = indicator-messages.service
 gsettings_SCHEMAS = com.canonical.indicator.messages.gschema.xml
 @GSETTINGS_RULES@
 
+indicatordir = $(INDICATOR_DIR)
+dist_indicator_DATA = com.canonical.indicator.messages
+
 EXTRA_DIST = \
 	$(gsettings_SCHEMAS) \
 	indicator-messages.service.in
-- 
cgit v1.2.3