← Back to branch summary

~ci-train-bot/unity8-desktop-session/unity8-desktop-session-ubuntu-xenial-landing-060

« back to all changes in this revision

Viewing changes to data/Makefile.am

  • Committer: CI bot
  • Author(s): Stephen M. Webb
  • Date: 2014-08-11 11:47:34 UTC
  • mfrom: (62.1.4 unity8-desktop-session)
  • Revision ID: ps-jenkins@lists.canonical.com-20140811114734-s5biuq9vtnhhfdap
remove the separate unity8-mir upstart job because the unity8 upstart job does everything necessary Fixes: 1353041, 1354029
Approved by: Christopher Townsend

Show diffs side-by-side

added added

removed removed

Lines of Context:
data/Makefile.am
16
16
# this program.  If not, see <http://www.gnu.org/licenses/>.
17
17
 
18
18
icondir = ${datadir}/unity-greeter
19
 
upstartdir = ${datadir}/upstart/sessions
20
19
lightdmdir = ${datadir}/lightdm
21
20
lightdm_confdir = ${lightdmdir}/lightdm.conf.d
22
21
lightdm_sessiondir = ${lightdmdir}/sessions
23
 
sbindir = ${prefix}/sbin
24
 
 
25
 
dist_pkgdata_SCRIPTS = \
26
 
        start-unity8-mir
27
22
 
28
23
dist_pkgdata_DATA = \
29
24
        sensors.txt
32
27
        custom_unity8-mir_badge.png \
33
28
        custom_unity8-x11_badge.png
34
29
 
35
 
dist_upstart_DATA = \
36
 
        unity8-mir.conf
37
 
 
38
30
dist_lightdm_conf_DATA = \
39
31
        10-unity8-x11.conf \
40
32
        55-unity8.conf
43
35
        unity8-mir.desktop \
44
36
        unity8-x11.desktop
45
37
 
46
 
dist_sbin_SCRIPTS = \
 
38
dist_bin_SCRIPTS = \
47
39
        lightdm-unity8-session
48
40
 
49
41
EXTRA_DIST = \
51
43
        custom_unity8-mir_badge.xcf \
52
44
        custom_unity8-x11_badge.xcf
53
45
 
54
 
CLEANFILES = \
55
 
        unity8-mir.desktop
56
 
 
57
 
unity8-mir.desktop: unity8-mir.desktop.in Makefile
58
 
        $(AM_V_GEN)sed -e 's,[@]EXEC_DIR[@],$(pkgdatadir),g' \
59
 
            <$(srcdir)/unity8-mir.desktop.in >unity8-mir.desktop