Index: configure.in
===================================================================
RCS file: /cvs/gnome/gconf/configure.in,v
retrieving revision 1.157
diff -u -r1.157 configure.in
--- configure.in	2 Feb 2004 12:50:39 -0000	1.157
+++ configure.in	16 Feb 2004 12:00:58 -0000
@@ -73,6 +73,13 @@
   REAL_PREFIX=$prefix
 fi
 
+AC_ARG_WITH(sysconfsubdir, AC_HELP_STRING([--with-sysconfsubdir],
+            [directory name used under sysconfdir, default=gconf]),
+            sysconfsubdir=${withval}, sysconfsubdir=gconf)
+if test x"${sysconfsubdir}" != x; then
+    sysconfdir="${sysconfdir}/${sysconfsubdir}"
+fi
+
 # Have to go $sysconfdir->$prefix/etc->/usr/local/etc   
 # if you actually know how to code shell then fix this :-)
 SYSCONFDIR_TMP="$sysconfdir"
@@ -85,15 +92,15 @@
 dnl Save flags to aclocal
 ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS"
 
-dnl Specify the configuration source, default to xml::$(sysconfdir)/gconf/gconf.xml.defaults
+dnl Specify the configuration source, default to xml::$(sysconfdir)/gconf.xml.defaults
 
 GCONF_CONFIG_SOURCE=
 AC_ARG_ENABLE(gconf-source, 
             [  --enable-gconf-source=sourceaddress      Where to install schema files.],GCONF_CONFIG_SOURCE=$enable_gconf_source,)
 
 if test "x$GCONF_CONFIG_SOURCE" = "x"; then
-        GCONF_CONFIG_SOURCE="xml::\${sysconfdir}/gconf/gconf.xml.defaults"
-	INSTALL_GCONF_CONFIG_SOURCE="xml::\$(DESTDIR)\${sysconfdir}/gconf/gconf.xml.defaults"
+        GCONF_CONFIG_SOURCE="xml::\${sysconfdir}/gconf.xml.defaults"
+	INSTALL_GCONF_CONFIG_SOURCE="xml::\$(DESTDIR)\${sysconfdir}/gconf.xml.defaults"
         AC_FYI("Using default config source $GCONF_CONFIG_SOURCE for schema installation")
 else
         AC_FYI("Using config source $GCONF_CONFIG_SOURCE for schema installation")
Index: gconf/Makefile.am
===================================================================
RCS file: /cvs/gnome/gconf/gconf/Makefile.am,v
retrieving revision 1.78
diff -u -r1.78 Makefile.am
--- gconf/Makefile.am	26 Apr 2003 07:21:10 -0000	1.78
+++ gconf/Makefile.am	16 Feb 2004 12:00:58 -0000
@@ -9,8 +9,8 @@
 	-DG_LOG_DOMAIN=\"GConf\"					\
 	-DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\"			\
         -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\"			\
-	-DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\"	\
-	-DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\"			\
+	-DGCONF_CONFDIR=\""$(sysconfdir)/$(MAJOR_VERSION)"\"		\
+	-DGCONF_ETCDIR=\""$(sysconfdir)"\"				\
 	-DGCONF_BINDIR=\""$(bindir)"\"					\
 	-DGCONF_SERVERDIR=\""$(libexecdir)"\"           \
 	-DGCONF_BUILDDIR=\""$(top_builddir)"\"				\
@@ -122,8 +122,8 @@
 EXTRA_DIST=GConfX.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
 
 install-data-local:
-	-mkdir -p $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)
-	$(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)/path
+	-mkdir -p $(DESTDIR)$(sysconfdir)/$(MAJOR_VERSION)
+	$(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/$(MAJOR_VERSION)/path
 
 gconfmarshal.h: @REBUILD@ stamp-gconfmarshal.h
 	@true
Index: gconf/default.path.in
===================================================================
RCS file: /cvs/gnome/gconf/gconf/default.path.in,v
retrieving revision 1.3
diff -u -r1.3 default.path.in
--- gconf/default.path.in	28 Oct 2003 14:31:51 -0000	1.3
+++ gconf/default.path.in	16 Feb 2004 12:00:58 -0000
@@ -7,13 +7,13 @@
 
 # Look first in systemwide mandatory settings directory
 # (commented out until xml backend knows how to be read-only for users)
-xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.mandatory
+xml:readonly:@EXPANDED_SYSCONFDIR@/gconf.xml.mandatory
 
 # To read in any mandatory settings that the Sys Admin may have created
 # prior to a desktop system upgrade. The SysAdmin can stick read-only system
 # wide sources in this file.
 
-include @EXPANDED_SYSCONFDIR@/gconf/2/local-mandatory.path
+include @EXPANDED_SYSCONFDIR@/2/local-mandatory.path
 
 # Now see where users want us to look - basically the user can stick arbitrary 
 # sources in a ~/.gconf.path file and they're inserted here
@@ -23,7 +23,7 @@
 # prior to a desktop system upgrade. The SysAdmin can stick default values
 # system-wide in this file.
 
-include @EXPANDED_SYSCONFDIR@/gconf/2/local-defaults.path
+include @EXPANDED_SYSCONFDIR@/2/local-defaults.path
 
 # Give users a default storage location, ~/.gconf
 
@@ -31,7 +31,7 @@
 
 # Finally, look at the systemwide defaults
 # (commented out for now)
-xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.defaults
+xml:readonly:@EXPANDED_SYSCONFDIR@/gconf.xml.defaults
 
 
 
Index: standard-schemas/Makefile.am
===================================================================
RCS file: /cvs/gnome/gconf/standard-schemas/Makefile.am,v
retrieving revision 1.6
diff -u -r1.6 Makefile.am
--- standard-schemas/Makefile.am	3 Oct 2000 19:14:25 -0000	1.6
+++ standard-schemas/Makefile.am	16 Feb 2004 12:01:00 -0000
@@ -4,7 +4,7 @@
 ## NOTE this file will be in multiple stable releases of GConf, 
 ## which means it should probably go in a separate RPM
 
-schemadir=$(sysconfdir)/gconf/schemas
+schemadir=$(sysconfdir)/schemas
 schema_DATA=desktop.schemas
 
 EXTRA_DIST=$(schema_DATA)
