From 356fd4ed9c9d394a8e4128accc93628df1b931d8 Mon Sep 17 00:00:00 2001
From: Lars Uebernickel <lars.uebernickel@canonical.com>
Date: Wed, 19 Jun 2013 14:58:12 -0400
Subject: Install indicator file

---
 configure.ac                       | 6 ++++++
 data/Makefile.am                   | 5 ++++-
 data/com.canonical.indicator.sound | 6 ++++++
 src/com.canonical.indicator.sound  | 6 ------
 4 files changed, 16 insertions(+), 7 deletions(-)
 create mode 100644 data/com.canonical.indicator.sound
 delete mode 100644 src/com.canonical.indicator.sound

diff --git a/configure.ac b/configure.ac
index d5713a4..71fb4aa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,12 @@ else
 fi
 AC_SUBST(DBUSSERVICEDIR)
 
+AC_ARG_WITH([indicator-dir],
+	    [AS_HELP_STRING([--with-indicator-dir=DIR], [Indicator directory [default=$datadir/unity/indicators]])],
+	    [],
+	    [with_indicator_dir=$datadir/unity/indicators])
+AC_SUBST([INDICATOR_DIR], [$with_indicator_dir])
+
 ##############################
 # Custom Junk
 ##############################
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
+  
diff --git a/data/com.canonical.indicator.sound b/data/com.canonical.indicator.sound
new file mode 100644
index 0000000..825fd30
--- /dev/null
+++ b/data/com.canonical.indicator.sound
@@ -0,0 +1,6 @@
+[Indicator Service]
+Name=indicator-sound
+ObjectPath=/com/canonical/indicator/sound
+
+[desktop]
+ObjectPath=/com/canonical/indicator/sound/desktop
diff --git a/src/com.canonical.indicator.sound b/src/com.canonical.indicator.sound
deleted file mode 100644
index 825fd30..0000000
--- a/src/com.canonical.indicator.sound
+++ /dev/null
@@ -1,6 +0,0 @@
-[Indicator Service]
-Name=indicator-sound
-ObjectPath=/com/canonical/indicator/sound
-
-[desktop]
-ObjectPath=/com/canonical/indicator/sound/desktop
-- 
cgit v1.2.3