← Back to branch summary

~darkxst/ubuntu/saucy/gdm/lp1212408

« back to all changes in this revision

Viewing changes to config/Makefile.am

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette
  • Date: 2008-09-02 10:37:20 UTC
  • mfrom: (1.4.27 upstream)
  • mto: This revision was merged to the branch mainline in revision 261.
  • Revision ID: james.westby@ubuntu.com-20080902103720-p810vv530hqj45wg
Tags: 2.20.7-3
http://bugs.debian.org/497440
* Install the debian-moreblue-orbit theme, thanks Andre Luiz Rodrigues 
  Ferreira. Closes: #497440.
* 35_gdm.conf.patch: make it the default.
* copyright: fix encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
config/Makefile.am
1
1
pixmapdir = $(datadir)/pixmaps
2
2
confdir = $(gdmconfdir)
3
 
localedir = $(gdmconfdir)
 
3
gdmlocaledir = $(gdmconfdir)
4
4
bisessdir = $(datadir)/gdm/BuiltInSessions
5
5
instsessdir = $(datadir)/xsessions
6
6
initdir = $(gdmconfdir)/Init
7
7
authdir = $(localstatedir)/gdm
8
 
logdir = $(localstatedir)/log/gdm
9
8
gnomercdir = $(gdmconfdir)
10
9
postdir = $(gdmconfdir)/PostSession
11
10
predir = $(gdmconfdir)/PreSession
12
11
postlogindir = $(gdmconfdir)/PostLogin
 
12
# logdir is set by configure.ac
13
13
 
14
14
noinst_DATA = gdm.conf
15
15
 
17
17
 
18
18
EXTRA_DIST = \
19
19
        gdm.conf.in \
20
 
        gdm.conf-custom \
 
20
        gdm.conf-custom.in \
21
21
        $(DESKTOP_FILES) \
22
22
        default.desktop.in \
23
 
        gnome.desktop.in \
 
23
        gnome.desktop.in.in \
24
24
        CDE.desktop.in \
25
25
        ssh.desktop.in.in \
26
26
        Xsession.in \
 
27
        Xsession.common \
 
28
        Xsession.solaris \
27
29
        gdm \
28
30
        gdm-autologin \
29
31
        locale.alias \
36
38
        gdmprefetchlist.in \
37
39
        extract-shell.sh
38
40
 
39
 
CLEANFILES = Xsession gdm.conf default.desktop gnome.desktop CDE.desktop ssh.desktop Init PreSession PostSession gdmprefetchlist
 
41
CLEANFILES = Xsession gdm.conf gdm.conf-custom default.desktop gnome.desktop CDE.desktop ssh.desktop Init PreSession PostSession gdmprefetchlist
 
42
 
 
43
if OS_SOLARIS
 
44
   DISTRO_XSESSION=$(srcdir)/Xsession.solaris
 
45
else
 
46
   DISTRO_XSESSION=$(srcdir)/Xsession.common
 
47
endif
40
48
 
41
49
Xsession: $(srcdir)/Xsession.in
42
50
        sed     -e 's,[@]XSESSION_SHELL[@],$(XSESSION_SHELL),g' \
43
51
                -e 's,[@]libexecdir[@],$(libexecdir),g' \
 
52
                -e '/^# @DISTRO_XSESSION@/r $(DISTRO_XSESSION)' \
 
53
                -e 's,[@]DISTRO_XSESSION[@],Distro configuration section,g' \
44
54
                <$(srcdir)/Xsession.in >Xsession
45
55
 
46
56
gdm.conf: $(srcdir)/gdm.conf.in
47
57
        sed     -e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
 
58
                -e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \
48
59
                -e 's,[@]GDM_USER_PATH[@],$(GDM_USER_PATH),g' \
49
60
                -e 's,[@]HALT_COMMAND[@],$(HALT_COMMAND),g' \
50
61
                -e 's,[@]REBOOT_COMMAND[@],$(REBOOT_COMMAND),g' \
51
62
                -e 's,[@]SOUND_PROGRAM[@],$(SOUND_PROGRAM),g' \
52
63
                -e 's,[@]SUSPEND_COMMAND[@],$(SUSPEND_COMMAND),g' \
53
64
                -e 's,[@]XEVIE_OPTION[@],$(XEVIE_OPTION),g' \
 
65
                -e 's,[@]ALWAYS_RESTART_SERVER[@],$(ALWAYS_RESTART_SERVER),g' \
 
66
                -e 's,[@]UTMP_LINE_ATTACHED[@],$(UTMP_LINE_ATTACHED),g' \
 
67
                -e 's,[@]UTMP_LINE_REMOTE[@],$(UTMP_LINE_REMOTE),g' \
 
68
                -e 's,[@]UTMP_PSEUDO_DEVICE[@],$(UTMP_PSEUDO_DEVICE),g' \
54
69
                -e 's,[@]X_CONFIG_OPTIONS[@],$(X_CONFIG_OPTIONS),g' \
55
70
                -e 's,[@]X_SERVER[@],$(X_SERVER),g' \
 
71
                -e 's,[@]X_XNEST_CMD[@],$(X_XNEST_CMD),g' \
56
72
                -e 's,[@]X_XNEST_CONFIG_OPTIONS[@],$(X_XNEST_CONFIG_OPTIONS),g' \
57
 
                -e 's,[@]X_XNEST_PATH[@],$(X_XNEST_PATH),g' \
 
73
                -e 's,[@]X_XNEST_UNSCALED_FONTPATH[@],$(X_XNEST_UNSCALED_FONTPATH),g' \
 
74
                -e 's,[@]GDM_RBAC_SYSCMD_KEYS[@],$(GDM_RBAC_SYSCMD_KEYS),g' \
58
75
                -e 's,[@]authdir[@],$(authdir),g' \
59
76
                -e 's,[@]datadir[@],$(datadir),g' \
60
77
                -e 's,[@]dmconfdir[@],$(dmconfdir),g' \
61
78
                -e 's,[@]gdmconfdir[@],$(gdmconfdir),g' \
62
79
                -e 's,[@]libdir[@],$(libdir),g' \
63
80
                -e 's,[@]libexecdir[@],$(libexecdir),g' \
64
 
                -e 's,[@]localedir[@],$(libexecdir),g' \
 
81
                -e 's,[@]gdmlocaledir[@],$(gdmlocaledir),g' \
65
82
                -e 's,[@]logdir[@],$(logdir),g' \
66
83
                -e 's,[@]pixmapdir[@],$(pixmapdir),g' \
67
84
                -e 's,[@]sbindir[@],$(sbindir),g' \
68
85
                <$(srcdir)/gdm.conf.in >gdm.conf
69
86
 
 
87
gdm.conf-custom: $(srcdir)/gdm.conf-custom.in
 
88
        sed     -e 's,[@]GDM_DEFAULTS_CONF[@],$(GDM_DEFAULTS_CONF),g' \
 
89
                <$(srcdir)/gdm.conf-custom.in >gdm.conf-custom
 
90
 
70
91
gettextfoo.h: XKeepsCrashing Xsession.in
71
92
        cat $^ | $(srcdir)/extract-shell.sh > gettextfoo.h
72
93
 
89
110
        $(DESTDIR)$(confdir)/XKeepsCrashing \
90
111
        $(DESTDIR)$(confdir)/Xsession \
91
112
        $(DESTDIR)$(confdir)/gdmprefetchlist \
92
 
        $(DESTDIR)$(localedir)/locale.alias \
 
113
        $(DESTDIR)$(gdmlocaledir)/locale.alias \
93
114
        $(DESTDIR)$(initdir)/Default \
94
115
        $(DESTDIR)$(postlogindir)/Default.sample \
95
116
        $(DESTDIR)$(predir)/Default \
124
145
        $(INSTALL_DATA) gdm.conf $(DESTDIR)$(GDM_DEFAULTS_CONF)
125
146
        chmod 444 $(DESTDIR)$(GDM_DEFAULTS_CONF)
126
147
        if test '!' -f $(DESTDIR)$(GDM_CUSTOM_CONF); then \
127
 
                $(INSTALL_DATA) $(srcdir)/gdm.conf-custom $(DESTDIR)$(GDM_CUSTOM_CONF); \
 
148
                $(INSTALL_DATA) gdm.conf-custom $(DESTDIR)$(GDM_CUSTOM_CONF); \
128
149
                chmod 644 $(DESTDIR)$(GDM_CUSTOM_CONF); \
129
150
        fi
130
151
        $(INSTALL_DATA) gdm.conf `dirname $(DESTDIR)$(GDM_DEFAULTS_CONF)`/factory-`basename $(DESTDIR)$(GDM_DEFAULTS_CONF)`
132
153
        $(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
133
154
        $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
134
155
 
135
 
        -if test -f $(DESTDIR)$(localedir)/locale.alias; then \
136
 
                cp -f $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \
 
156
        -if test -f $(DESTDIR)$(gdmlocaledir)/locale.alias; then \
 
157
                cp -f $(DESTDIR)$(gdmlocaledir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias.orig; \
137
158
        fi
138
 
        $(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(localedir)/locale.alias
 
159
        $(INSTALL_DATA) $(srcdir)/locale.alias $(DESTDIR)$(gdmlocaledir)/locale.alias
139
160
 
140
161
        if test '!' -d $(DESTDIR)$(bisessdir); then \
141
162
                $(mkinstalldirs) $(DESTDIR)$(bisessdir); \