summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Cameron <bcameron@src.gnome.org>2005-08-09 04:31:11 +0000
committerBrian Cameron <bcameron@src.gnome.org>2005-08-09 04:31:11 +0000
commitf771b4b280a7c4344c26c61ad055cf6485253934 (patch)
treedef7407677455a2cf76a62726765626ad005c98e
parent51852799fc54a0dbf0a55ca998d0c84a5d3d4158 (diff)
downloadgdm-f771b4b280a7c4344c26c61ad055cf6485253934.tar.gz
Messed up last commit. Fixing.GDM2_2_8_0_2
-rw-r--r--config/Makefile.am2
-rw-r--r--configure.in4
2 files changed, 3 insertions, 3 deletions
diff --git a/config/Makefile.am b/config/Makefile.am
index e7a77069..87eeb24c 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -1,6 +1,6 @@
pixmapdir = $(datadir)/pixmaps
confdir = $(sysconfdir)/gdm
-gdmconfdir = $(GDM_CONFIGDIR)/gdm
+gdmconfdir = $(GDM_CONFIGDIR)
crossconfdir = $(sysconfdir)/dm
localedir = $(sysconfdir)/gdm
bisessdir = $(datadir)/gdm/BuiltInSessions
diff --git a/configure.in b/configure.in
index 164c3695..82319ed3 100644
--- a/configure.in
+++ b/configure.in
@@ -825,12 +825,12 @@ AC_DEFINE_UNQUOTED(AT_BINDIR,"$AT_BINDIR")
withval=""
AC_ARG_WITH(configdir,
-[ --with-configdir=<PATH> PATH to Install gdm.conf configuration file [default=EXPANDED_SYSCONFDIR]],)
+[ --with-configdir=<PATH> PATH to Install gdm.conf configuration file [default=sysconfdir/gdm]],)
if test x$withval != x; then
GDM_CONFIGDIR="$withval"
else
- GDM_CONFIGDIR="$EXPANDED_SYSCONFDIR/gdm"
+ GDM_CONFIGDIR="$sysconfdir/gdm"
fi
AC_SUBST(GDM_CONFIGDIR)