aboutsummaryrefslogtreecommitdiff
path: root/data/Makefile.am
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2020-08-10 17:01:24 +0200
committerRobert Tari <robert@tari.in>2020-08-10 17:01:24 +0200
commitc6909fa0d26779f9283c049678c02e0371284327 (patch)
treeb0cb9201cffa8e0bb7ea88b66fff6ff5752c125c /data/Makefile.am
parent9e09aaa26e5cc9a5c628191411040bcb535afc55 (diff)
parentc7c7c61001ed98da2d51cdfd453ab98f9d406550 (diff)
downloadayatana-indicator-application-c6909fa0d26779f9283c049678c02e0371284327.tar.gz
ayatana-indicator-application-c6909fa0d26779f9283c049678c02e0371284327.tar.bz2
ayatana-indicator-application-c6909fa0d26779f9283c049678c02e0371284327.zip
Merge branch 'sunweaver-pr/drop-upstart-support'
Attributes GH PR #4: https://github.com/AyatanaIndicators/ayatana-indicator-application/pull/4
Diffstat (limited to 'data/Makefile.am')
-rw-r--r--data/Makefile.am21
1 files changed, 5 insertions, 16 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 96abc17..671d5c0 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,11 +1,4 @@
-
-SUBDIRS = upstart
-
-upstart_jobsdir = $(datadir)/upstart/sessions/
-upstart_jobs_DATA = ayatana-indicator-application.conf
-
-%.conf: %.conf.in
- $(AM_V_GEN) sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
+NULL =
xdg_autostartdir = /etc/xdg/autostart
xdg_autostart_DATA = ayatana-indicator-application.desktop
@@ -24,17 +17,13 @@ systemddir = $(SYSTEMD_USERDIR)
systemd_DATA = ayatana-indicator-application.service
#endif
-upstartsystemdoverridedir = $(datadir)/upstart/systemd-session/upstart
-upstartsystemdoverride_DATA = ayatana-indicator-application.override
-
EXTRA_DIST = \
ayatana-indicator-application.desktop.in \
- ayatana-indicator-application.conf.in \
ayatana-indicator-application.service.in \
- ayatana-indicator-application.override \
- ordering-override.keyfile
+ ordering-override.keyfile \
+ $(NULL)
CLEANFILES = \
- ayatana-indicator-application.conf \
ayatana-indicator-application.desktop \
- ayatana-indicator-application.service
+ ayatana-indicator-application.service \
+ $(NULL)