? configure.lineno
Index: Makefile.am
===================================================================
RCS file: /cvs/gnome/gconf/Makefile.am,v
retrieving revision 1.26
diff -u -r1.26 Makefile.am
--- Makefile.am	15 Dec 2003 03:23:23 -0000	1.26
+++ Makefile.am	2 Jul 2004 21:16:25 -0000
@@ -8,10 +8,10 @@
 install-data-local:
 	-mkdir -p $(DESTDIR)$(datadir)/aclocal
 	$(INSTALL_DATA) gconf.m4 $(DESTDIR)$(datadir)/aclocal/gconf-$(MAJOR_VERSION).m4
-	-mkdir -p $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.defaults
-	-chmod 755 $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.defaults
-	-mkdir -p $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.mandatory
-	-chmod 755 $(DESTDIR)$(sysconfdir)/gconf/gconf.xml.mandatory
+	-mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
+	-chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.defaults
+	-mkdir -p $(DESTDIR)$(sysgconfdir)/gconf.xml.mandatory
+	-chmod 755 $(DESTDIR)$(sysgconfdir)/gconf.xml.mandatory
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = gconf-2.0.pc
Index: configure.in
===================================================================
RCS file: /cvs/gnome/gconf/configure.in,v
retrieving revision 1.171
diff -u -r1.171 configure.in
--- configure.in	1 Jul 2004 06:06:10 -0000	1.171
+++ configure.in	2 Jul 2004 21:16:29 -0000
@@ -73,27 +73,37 @@
   REAL_PREFIX=$prefix
 fi
 
-# Have to go $sysconfdir->$prefix/etc->/usr/local/etc   
+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
+    sysgconfdir="${sysconfdir}/${sysconfsubdir}"
+else
+    sysgconfdir="${sysconfdir}"
+fi
+AC_SUBST(sysgconfdir)
+
+# Have to go $sysgconfdir->$prefix/etc->/usr/local/etc   
 # if you actually know how to code shell then fix this :-)
-SYSCONFDIR_TMP="$sysconfdir"
+SYSGCONFDIR_TMP="$sysgconfdir"
 old_prefix=$prefix
 prefix=$REAL_PREFIX
-EXPANDED_SYSCONFDIR=`eval echo $SYSCONFDIR_TMP`
+EXPANDED_SYSGCONFDIR=`eval echo $SYSGCONFDIR_TMP`
 prefix=$old_prefix
-AC_SUBST(EXPANDED_SYSCONFDIR)
+AC_SUBST(EXPANDED_SYSGCONFDIR)
 
 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::$(sysgconfdir)/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::\${sysgconfdir}/gconf.xml.defaults"
+	INSTALL_GCONF_CONFIG_SOURCE="xml::\$(DESTDIR)\${sysgconfdir}/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: examples/Makefile.am
===================================================================
RCS file: /cvs/gnome/gconf/examples/Makefile.am,v
retrieving revision 1.10
diff -u -r1.10 Makefile.am
--- examples/Makefile.am	7 Dec 2001 04:42:40 -0000	1.10
+++ examples/Makefile.am	2 Jul 2004 21:16:29 -0000
@@ -1,6 +1,6 @@
 INCLUDES=-I$(top_srcdir) -I$(top_builddir) \
 	$(DEPENDENT_WITH_GTK_CFLAGS) \
-        -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysconfdir)"\"
+        -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysgconfdir)"\"
 
 EFENCE=
 
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	2 Jul 2004 21:16:30 -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=\""$(sysgconfdir)/$(MAJOR_VERSION)"\"		\
+	-DGCONF_ETCDIR=\""$(sysgconfdir)"\"				\
 	-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)$(sysgconfdir)/$(MAJOR_VERSION)
+	$(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(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.4
diff -u -r1.4 default.path.in
--- gconf/default.path.in	1 Apr 2004 13:40:29 -0000	1.4
+++ gconf/default.path.in	2 Jul 2004 21:16:30 -0000
@@ -7,12 +7,12 @@
 
 # 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_SYSGCONFDIR@/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_SYSGCONFDIR@/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
@@ -24,10 +24,10 @@
 # To read in any defaults settings that the Sys Admin may have created
 # 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_SYSGCONFDIR@/2/local-defaults.path
 
 # Finally, look at the systemwide defaults
-xml:readonly:@EXPANDED_SYSCONFDIR@/gconf/gconf.xml.defaults
+xml:readonly:@EXPANDED_SYSGCONFDIR@/gconf.xml.defaults
 
 
 
Index: gconf/gconftool.c
===================================================================
RCS file: /cvs/gnome/gconf/gconf/gconftool.c,v
retrieving revision 1.91
diff -u -r1.91 gconftool.c
--- gconf/gconftool.c	5 Apr 2004 19:14:51 -0000	1.91
+++ gconf/gconftool.c	2 Jul 2004 21:16:44 -0000
@@ -4005,7 +4005,7 @@
   gchar buf[512];
   FILE *f;
 
-  /* Try with $sysconfdir/gconf/schema-install-source */
+  /* Try with $sysgconfdir/schema-install-source */
   f = fopen(GCONF_ETCDIR"/schema-install-source", "r");
 
   if (f != NULL)
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	2 Jul 2004 21:16:45 -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=$(sysgconfdir)/schemas
 schema_DATA=desktop.schemas
 
 EXTRA_DIST=$(schema_DATA)
Index: wrappers/cxx/Makefile.am
===================================================================
RCS file: /cvs/gnome/gconf/wrappers/cxx/Makefile.am,v
retrieving revision 1.1
diff -u -r1.1 Makefile.am
--- wrappers/cxx/Makefile.am	1 Sep 1999 17:44:22 -0000	1.1
+++ wrappers/cxx/Makefile.am	2 Jul 2004 21:16:45 -0000
@@ -1,5 +1,5 @@
 INCLUDES=-I$(top_srcdir) $(GLIB_CFLAGS) $(GMODULE_CFLAGS) $(ORBIT_CFLAGS)\
-        -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysconfdir)"\" -DGCONF_BACKEND_DIR=\""$(pkglibdir)"\"
+        -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" -DGCONF_SYSCONFDIR=\""$(sysgconfdir)"\" -DGCONF_BACKEND_DIR=\""$(pkglibdir)"\"
 
 lib_LTLIBRARIES = libgconf-cxxclient.la
 
