aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2014-02-19 21:27:31 -0600
committerTed Gould <ted@gould.cx>2014-02-19 21:27:31 -0600
commitf179a2c7f91497854fa787eb0c65e547a791f038 (patch)
tree47fac92119d9a69049a08af9ece4e1e815c28057
parentc6a36f4305d52fb74d9990174fb9c455c01f4014 (diff)
downloadayatana-indicator-application-f179a2c7f91497854fa787eb0c65e547a791f038.tar.gz
ayatana-indicator-application-f179a2c7f91497854fa787eb0c65e547a791f038.tar.bz2
ayatana-indicator-application-f179a2c7f91497854fa787eb0c65e547a791f038.zip
Build the upstart desktop file in its own directory
-rw-r--r--configure.ac1
-rw-r--r--data/Makefile.am2
-rw-r--r--data/upstart/Makefile.am9
-rw-r--r--data/upstart/indicator-application.desktop.in (renamed from data/indicator-application.upstart.desktop.in)0
4 files changed, 12 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac
index 2d1ccc0..d49a986 100644
--- a/configure.ac
+++ b/configure.ac
@@ -96,6 +96,7 @@ AC_OUTPUT([
Makefile
src/Makefile
data/Makefile
+data/upstart/Makefile
tests/Makefile
])
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/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/indicator-application.upstart.desktop.in b/data/upstart/indicator-application.desktop.in
index ee1c4a1..ee1c4a1 100644
--- a/data/indicator-application.upstart.desktop.in
+++ b/data/upstart/indicator-application.desktop.in