aboutsummaryrefslogtreecommitdiff
path: root/data/Makefile.am
diff options
context:
space:
mode:
authorPete Woods <pete.woods@canonical.com>2013-08-21 16:04:53 +0000
committerTarmac <Unknown>2013-08-21 16:04:53 +0000
commit933deb6d32c36e8bf6db23d5673982cab788337a (patch)
treebe808298ec80ca3dc6d73309ac9e1e7024ee7950 /data/Makefile.am
parent94fef3bf0ca765544ef93f4a6cd38684b3ccf02e (diff)
parent046f655a8859e2e3eaa6015fc2ecd226c8b46b1f (diff)
downloadayatana-indicator-messages-933deb6d32c36e8bf6db23d5673982cab788337a.tar.gz
ayatana-indicator-messages-933deb6d32c36e8bf6db23d5673982cab788337a.tar.bz2
ayatana-indicator-messages-933deb6d32c36e8bf6db23d5673982cab788337a.zip
Re-merge the consolidate branch, but with additional bugfix.
Approved by Sebastien Bacher, PS Jenkins bot.
Diffstat (limited to 'data/Makefile.am')
-rw-r--r--data/Makefile.am5
1 files changed, 4 insertions, 1 deletions
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