summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorBrian Cameron <brian.cameron@sun.com>2006-02-13 21:09:11 +0000
committerBrian Cameron <bcameron@src.gnome.org>2006-02-13 21:09:11 +0000
commit3dc1d30d743e1df444fa8cceeeabf39ab669ea4c (patch)
treee3edfe639849a42770d65734e8a685391fa212c7 /configure.ac
parent9db396d4a5fa5d4e854f44bcc0b761036c66e2c9 (diff)
downloadgdm-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 'configure.ac')
-rw-r--r--configure.ac4
1 files changed, 2 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index 44d6e5ab..bf125163 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.52)
AC_INIT(daemon/gdm.h)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gdm,2.13.0.7)
+AM_INIT_AUTOMAKE(gdm,2.13.0.8)
AC_CONFIG_MACRO_DIR([m4])
AM_MAINTAINER_MODE
@@ -855,7 +855,7 @@ AC_ARG_WITH(defaults_conf,
if test x$withval != x; then
GDM_DEFAULTS_CONF="$withval"
else
- GDM_DEFAULTS_CONF="$datadir/gdm/defaults.conf"
+ GDM_DEFAULTS_CONF="$EXPANDED_DATADIR/gdm/defaults.conf"
fi
AC_SUBST(GDM_DEFAULTS_CONF)