diff options
| author | Ted Gould <ted@gould.cx> | 2014-02-19 21:23:36 -0600 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2014-02-19 21:23:36 -0600 |
| commit | df7564337cd22eb4b293b6b21f358fabec16da86 (patch) | |
| tree | 0eca880da30c70bdf064d8a81647192bc39ed0ef /data | |
| parent | 514971dadafe6166e1371036709bade85f2a9559 (diff) | |
| download | ayatana-indicator-bluetooth-df7564337cd22eb4b293b6b21f358fabec16da86.tar.gz ayatana-indicator-bluetooth-df7564337cd22eb4b293b6b21f358fabec16da86.tar.bz2 ayatana-indicator-bluetooth-df7564337cd22eb4b293b6b21f358fabec16da86.zip | |
Putting the upstart directory in its own directory so it doesn't fight
Diffstat (limited to 'data')
| -rw-r--r-- | data/Makefile.am | 16 | ||||
| -rw-r--r-- | data/upstart/Makefile.am | 17 | ||||
| -rw-r--r-- | data/upstart/indicator-bluetooth.desktop.in (renamed from data/indicator-bluetooth.upstart.desktop.in) | 0 |
3 files changed, 20 insertions, 13 deletions
diff --git a/data/Makefile.am b/data/Makefile.am index 9784451..81f4d5e 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,6 +2,8 @@ BUILT_SOURCES = EXTRA_DIST = CLEANFILES = +SUBDIRS = upstart + # the indicator bus file indicatorsdir = $(datadir)/unity/indicators dist_indicators_DATA = com.canonical.indicator.bluetooth @@ -16,17 +18,6 @@ BUILT_SOURCES += $(upstart_jobs_DATA) EXTRA_DIST += $(upstart_jobs_in) CLEANFILES += $(upstart_jobs_DATA) -# the upstart version of the xdg autostart job file -# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100 -upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart -upstart_xdg_autostart_DATA = indicator-bluetooth.desktop -upstart_xdg_autostart_in = indicator-bluetooth.upstart.desktop.in -$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in) - $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ -BUILT_SOURCES += $(upstart_xdg_autostart_DATA) -EXTRA_DIST += $(upstart_xdg_autostart_in) -CLEANFILES += $(upstart_xdg_autostart_DATA) - # the xdg autostart job file xdg_autostartdir = /etc/xdg/autostart xdg_autostart_DATA = indicator-bluetooth.desktop @@ -45,8 +36,7 @@ gsettings_SCHEMAS = com.canonical.indicator.bluetooth.gschema.xml EXTRA_DIST += \ com.canonical.indicator.bluetooth.gschema.xml.in \ indicator-bluetooth.conf.in \ - indicator-bluetooth.desktop.in \ - indicator-bluetooth.upstart.desktop.in + indicator-bluetooth.desktop.in CLEANFILES += \ $(dbus_services_DATA) \ diff --git a/data/upstart/Makefile.am b/data/upstart/Makefile.am new file mode 100644 index 0000000..2012021 --- /dev/null +++ b/data/upstart/Makefile.am @@ -0,0 +1,17 @@ +BUILT_SOURCES = +EXTRA_DIST = +CLEANFILES = + +# the upstart version of the xdg autostart job file +# see https://code.launchpad.net/~charlesk/indicator-bluetooth/upstart-job/+merge/198100 +upstart_xdg_autostartdir = $(datadir)/upstart/xdg/autostart +upstart_xdg_autostart_DATA = indicator-bluetooth.desktop +upstart_xdg_autostart_in = indicator-bluetooth.desktop.in +$(upstart_xdg_autostart_DATA): $(upstart_xdg_autostart_in) + $(AM_V_GEN) $(SED) -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@ +BUILT_SOURCES += $(upstart_xdg_autostart_DATA) +EXTRA_DIST += $(upstart_xdg_autostart_in) +CLEANFILES += $(upstart_xdg_autostart_DATA) + +EXTRA_DIST += \ + indicator-bluetooth.upstart.desktop.in diff --git a/data/indicator-bluetooth.upstart.desktop.in b/data/upstart/indicator-bluetooth.desktop.in index 523cfa0..523cfa0 100644 --- a/data/indicator-bluetooth.upstart.desktop.in +++ b/data/upstart/indicator-bluetooth.desktop.in |