diff options
| author | George Lebl <jirka@5z.com> | 2001-04-30 06:53:51 +0000 |
|---|---|---|
| committer | George Lebl <jirka@src.gnome.org> | 2001-04-30 06:53:51 +0000 |
| commit | 3c21d9c9abcb0e9d8658976f8dc559224f960edf (patch) | |
| tree | bb7aa737d14801c28e34e6e7777509ba61d22ce6 /config | |
| parent | efec4814a8e2b2cb11e2003ea0ffaa9140f4b384 (diff) | |
| download | gdm-3c21d9c9abcb0e9d8658976f8dc559224f960edf.tar.gz | |
Revert stupid changes, now we rely on a new enough gnome-core where gsm
Sun Apr 29 23:54:34 2001 George Lebl <jirka@5z.com>
* config/Gnome.in, config/gnomerc, config/Makefile.am: Revert stupid
changes, now we rely on a new enough gnome-core where gsm
understands GDM_GNOME_SESSION (in a similar way to GDM_LANG)
* daemon/verify-*.c: Eeeek Forgot to use the GDM_LOGIN prompter
opcode and that made the greeter very unhappy
* gui/gdmconfig.c, gui/gdmlogin.c: Ignore .orig files as well when
looking at the Sessions dir
Diffstat (limited to 'config')
| -rwxr-xr-x | config/Gnome.in | 4 | ||||
| -rw-r--r-- | config/Makefile.am | 8 |
2 files changed, 7 insertions, 5 deletions
diff --git a/config/Gnome.in b/config/Gnome.in index 3fc46dec..8e357058 100755 --- a/config/Gnome.in +++ b/config/Gnome.in @@ -10,9 +10,7 @@ do fi done -if [ x != x$GDM_GNOME_SESSION ]; then - exec /usr/bin/gnome-session --choose-session "$GDM_GNOME_SESSION" -elif [ -x "$HOME/.gnomerc" ]; then +if [ -x "$HOME/.gnomerc" ]; then exec "$HOME/.gnomerc" else exec "@EXPANDED_SYSCONFDIR@/gdm/gnomerc" diff --git a/config/Makefile.am b/config/Makefile.am index aa87559c..bb994ed4 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -48,7 +48,9 @@ install-data-hook: gdm.conf gnomerc Gnome Failsafe $(INSTALL_SCRIPT) $(srcdir)/Xsession $(sessdir)/Xsession; \ fi - $(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome; + if test '!' -f $(sessdir)/Gnome; then \ + $(INSTALL_SCRIPT) Gnome $(sessdir)/Gnome; \ + fi if test '!' -f $(sessdir)/Failsafe; then \ $(INSTALL_SCRIPT) Failsafe $(sessdir)/Failsafe; \ @@ -87,7 +89,9 @@ install-data-hook: gdm.conf gnomerc Gnome Failsafe chmod 755 $(gnomercdir); \ fi - $(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; + if test '!' -f $(gnomercdir)/gnomerc; then \ + $(INSTALL_SCRIPT) gnomerc $(gnomercdir)/gnomerc; \ + fi if test '!' -d $(authdir); then \ $(mkinstalldirs) $(authdir); \ |