diff options
| author | Robert Tari <robert@tari.in> | 2020-08-10 16:59:48 +0200 |
|---|---|---|
| committer | Robert Tari <robert@tari.in> | 2020-08-10 16:59:48 +0200 |
| commit | c7c7c61001ed98da2d51cdfd453ab98f9d406550 (patch) | |
| tree | b0cb9201cffa8e0bb7ea88b66fff6ff5752c125c /data/Makefile.am | |
| parent | 9e09aaa26e5cc9a5c628191411040bcb535afc55 (diff) | |
| parent | 172e68235ff199667914a5789471be2425081acf (diff) | |
| download | ayatana-indicator-application-c7c7c61001ed98da2d51cdfd453ab98f9d406550.tar.gz ayatana-indicator-application-c7c7c61001ed98da2d51cdfd453ab98f9d406550.tar.bz2 ayatana-indicator-application-c7c7c61001ed98da2d51cdfd453ab98f9d406550.zip | |
Merge branch 'pr/drop-upstart-support' of https://github.com/sunweaver/ayatana-indicator-application into 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.am | 21 |
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) |