diff options
| author | Brian Cameron <brian.cameron@sun.com> | 2006-02-13 21:09:11 +0000 |
|---|---|---|
| committer | Brian Cameron <bcameron@src.gnome.org> | 2006-02-13 21:09:11 +0000 |
| commit | 3dc1d30d743e1df444fa8cceeeabf39ab669ea4c (patch) | |
| tree | e3edfe639849a42770d65734e8a685391fa212c7 /config | |
| parent | 9db396d4a5fa5d4e854f44bcc0b761036c66e2c9 (diff) | |
| download | gdm-3dc1d30d743e1df444fa8cceeeabf39ab669ea4c.tar.gz | |
Updated. Update to 2.13.0.8 and use EXPANDED_DATADIR instead of %{datadir}
2006-02-13 Brian Cameron <brian.cameron@sun.com>
* Release 2.13.0.8:
* NEWS: Updated.
* configure.ac: Update to 2.13.0.8 and use EXPANDED_DATADIR instead
of %{datadir} since that makes it work much better.
* README.install, README, docs/C/gdm.xml: Update docs so that the
change from --with-configdir to --with-defaults-conf and renaming of
default and custom config file is documented.
* daemon/gdm-net.c, daemon/gdmconfig.c, gui/gdmsetup.c: Update comments
to no longer mention old name of config file. Fix gdmsetup to know
new location of custom config file.
* config/Makefile.am: Now if upgrading and gdm.conf and
factory-gdm.conf are different, move the gdm.conf file to
custom.conf instead of copy. This is because we don't want GDM
to overwrite the custom.conf file every time user upgrades. Only
first time, then gdm.conf should go away.
Diffstat (limited to 'config')
| -rw-r--r-- | config/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/config/Makefile.am b/config/Makefile.am index dbd9c7af..004fb4d0 100644 --- a/config/Makefile.am +++ b/config/Makefile.am @@ -85,9 +85,9 @@ install-data-hook: gdm.conf gdm.conf-custom Xsession Init PostSession PreSession if test -f $(DESTDIR)$(confdir)/gdm.conf; then \ if ! cmp -s $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf > /dev/null 2>&1 ; then \ if test '!' -f $(DESTDIR)$(GDM_CUSTOM_CONF); then \ - cp -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(GDM_CUSTOM_CONF); \ + mv -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(GDM_CUSTOM_CONF); \ else \ - cp -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(GDM_DEFAULTS_CONF).org; \ + mv -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(GDM_DEFAULTS_CONF).org; \ fi; \ fi; \ fi |