From 356fd4ed9c9d394a8e4128accc93628df1b931d8 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 19 Jun 2013 14:58:12 -0400 Subject: Install indicator file --- 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 2891606..243662c 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,10 +10,13 @@ dbus_services_DATA = indicator-sound.service %.service: %.service.in sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ +indicatordir = $(INDICATOR_DIR) +dist_indicator_DATA = com.canonical.indicator.sound + EXTRA_DIST = \ $(gsettings_SCHEMAS) \ indicator-sound.service.in CLEANFILES = \ $(dbus_services_DATA) - \ No newline at end of file + -- cgit v1.2.3 From bb23395d4a7b5889c91b3708e46c75623fe7f2a9 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Wed, 19 Jun 2013 15:17:00 -0400 Subject: Remove icon The single icon that was in this package was not used anywhere. --- data/Makefile.am | 2 -- 1 file changed, 2 deletions(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 243662c..a64dff4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,5 +1,3 @@ -SUBDIRS = icons - gsettings_SCHEMAS = \ com.canonical.indicator.sound.gschema.xml @GSETTINGS_RULES@ -- cgit v1.2.3 From 0ef34d217850fcf160e1045dbd4a0be412e5087e Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 4 Jul 2013 16:00:09 -0400 Subject: Remove --enable-localinstall Always put dbus service file into $(datadir)/dbus-1/services --- data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index a64dff4..5160dd9 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,7 @@ gsettings_SCHEMAS = \ com.canonical.indicator.sound.gschema.xml @GSETTINGS_RULES@ -dbus_servicesdir = $(DBUSSERVICEDIR) +dbus_servicesdir = $(datadir)/dbus-1/services dbus_services_DATA = indicator-sound.service %.service: %.service.in -- cgit v1.2.3 From 7ca667494e32d110766c2b4a013b6a2c37b8a084 Mon Sep 17 00:00:00 2001 From: Lars Uebernickel Date: Thu, 4 Jul 2013 16:09:09 -0400 Subject: Put service into $pkglibexecdir --- data/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 5160dd9..7647d73 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -6,7 +6,7 @@ dbus_servicesdir = $(datadir)/dbus-1/services dbus_services_DATA = indicator-sound.service %.service: %.service.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ indicatordir = $(INDICATOR_DIR) dist_indicator_DATA = com.canonical.indicator.sound -- cgit v1.2.3