From f179a2c7f91497854fa787eb0c65e547a791f038 Mon Sep 17 00:00:00 2001
From: Ted Gould <ted@gould.cx>
Date: Wed, 19 Feb 2014 21:27:31 -0600
Subject: Build the upstart desktop file in its own directory

---
 data/Makefile.am                              | 2 ++
 data/indicator-application.upstart.desktop.in | 8 --------
 data/upstart/Makefile.am                      | 9 +++++++++
 data/upstart/indicator-application.desktop.in | 8 ++++++++
 4 files changed, 19 insertions(+), 8 deletions(-)
 delete mode 100644 data/indicator-application.upstart.desktop.in
 create mode 100644 data/upstart/Makefile.am
 create mode 100644 data/upstart/indicator-application.desktop.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 77ec71d..6f46c2e 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,4 +1,6 @@
 
+SUBDIRS = upstart
+
 upstart_jobsdir = $(datadir)/upstart/sessions/
 upstart_jobs_DATA = indicator-application.conf
 
diff --git a/data/indicator-application.upstart.desktop.in b/data/indicator-application.upstart.desktop.in
deleted file mode 100644
index ee1c4a1..0000000
--- a/data/indicator-application.upstart.desktop.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Indicator Application
-Exec=@libexecdir@/indicator-application-service
-StartupNotify=false
-Terminal=false
-OnlyShowIn=Unity;XFCE;
-Hidden=true
diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am
new file mode 100644
index 0000000..a384c75
--- /dev/null
+++ b/data/upstart/Makefile.am
@@ -0,0 +1,9 @@
+
+xdg_autostartdir = $(datadir)/upstart/xdg/autostart
+xdg_autostart_DATA = indicator-application.desktop
+
+%.desktop: %.desktop.in
+	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+
+EXTRA_DIST = \
+	indicator-application.desktop.in
diff --git a/data/upstart/indicator-application.desktop.in b/data/upstart/indicator-application.desktop.in
new file mode 100644
index 0000000..ee1c4a1
--- /dev/null
+++ b/data/upstart/indicator-application.desktop.in
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Name=Indicator Application
+Exec=@libexecdir@/indicator-application-service
+StartupNotify=false
+Terminal=false
+OnlyShowIn=Unity;XFCE;
+Hidden=true
-- 
cgit v1.2.3