From f179a2c7f91497854fa787eb0c65e547a791f038 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 19 Feb 2014 21:27:31 -0600 Subject: Build the upstart desktop file in its own directory --- data/Makefile.am | 2 ++ 1 file changed, 2 insertions(+) (limited to 'data/Makefile.am') 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 -- cgit v1.2.3 From dd359a11a25e6aa082d405c56c5b1255cd844c76 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Wed, 19 Feb 2014 21:31:05 -0600 Subject: Switch to using pkglibexecdir --- data/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 6f46c2e..3f9f7ad 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,13 +5,13 @@ upstart_jobsdir = $(datadir)/upstart/sessions/ upstart_jobs_DATA = indicator-application.conf %.conf: %.conf.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ xdg_autostartdir = /etc/xdg/autostart xdg_autostart_DATA = indicator-application.desktop %.desktop: %.desktop.in - sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ + sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ overridedir = $(pkgdatadir) override_DATA = ordering-override.keyfile -- cgit v1.2.3 From e48b26bcffdf75b4454611f88018c1a783c2e9c9 Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Thu, 20 Feb 2014 14:48:59 -0600 Subject: Removes the indicator service code --- data/Makefile.am | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'data/Makefile.am') diff --git a/data/Makefile.am b/data/Makefile.am index 3f9f7ad..b26a669 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -5,13 +5,13 @@ upstart_jobsdir = $(datadir)/upstart/sessions/ upstart_jobs_DATA = indicator-application.conf %.conf: %.conf.in - sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ + $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ xdg_autostartdir = /etc/xdg/autostart xdg_autostart_DATA = indicator-application.desktop %.desktop: %.desktop.in - sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ + $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ overridedir = $(pkgdatadir) override_DATA = ordering-override.keyfile @@ -22,5 +22,6 @@ EXTRA_DIST = \ ordering-override.keyfile CLEANFILES = \ - indicator-application.conf + indicator-application.conf \ + indicator-application.desktop -- cgit v1.2.3