diff options
| -rw-r--r-- | ChangeLog | 17 | ||||
| -rw-r--r-- | Makefile.am | 8 | ||||
| -rw-r--r-- | configure.in | 24 | ||||
| -rw-r--r-- | examples/Makefile.am | 2 | ||||
| -rw-r--r-- | gconf/Makefile.am | 8 | ||||
| -rw-r--r-- | gconf/default.path.in | 8 | ||||
| -rw-r--r-- | gconf/gconftool.c | 2 | ||||
| -rw-r--r-- | standard-schemas/Makefile.am | 2 | ||||
| -rw-r--r-- | wrappers/cxx/Makefile.am | 2 |
9 files changed, 50 insertions, 23 deletions
@@ -1,3 +1,20 @@ +2004-07-04 Mark McLoughlin <mark@skynet.ie> + + Patch from Julio M. Merino Vidal <jmmv@menta.net> in bug #134517 + to add a --sysconfsubdir configure argument which allows the + sub-directory GConf uses under $sysconfdir to be change. + + * configure.in: add --sysconfsubdir argument and subst $sysgconfdir + which contains the full sysconf path GConf uses. + + * Makefile.am, + examples/Makefile.am, + gconf/Makefile.am, + gconf/default.path.in, + gconf/gconftool.c, + standard-schemas/Makefile.am, + wrappers/cxx/Makefile.am: use $sysgconfdir. + 2004-07-02 Mark McLoughlin <mark@skynet.ie> Fixup some bugs with the merge files support which was diff --git a/Makefile.am b/Makefile.am index 2b10957a..27bf1dbc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -8,10 +8,10 @@ EXTRA_DIST=gconf.m4.in TODO \ 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 diff --git a/configure.in b/configure.in index e6c8a35a..f5f89292 100644 --- a/configure.in +++ b/configure.in @@ -73,27 +73,37 @@ else 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") diff --git a/examples/Makefile.am b/examples/Makefile.am index 8f4f02b5..576efefb 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -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= diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 4df3d47a..28cae360 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -9,8 +9,8 @@ INCLUDES= \ -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 @@ libgconf_2_la_LIBADD = $(INTLLIBS) $(DEPENDENT_LIBS) 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 diff --git a/gconf/default.path.in b/gconf/default.path.in index 57793793..f12013c1 100644 --- a/gconf/default.path.in +++ b/gconf/default.path.in @@ -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 @@ xml:readwrite:$(HOME)/.gconf # 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 diff --git a/gconf/gconftool.c b/gconf/gconftool.c index 720cc5d8..e51643f6 100644 --- a/gconf/gconftool.c +++ b/gconf/gconftool.c @@ -4014,7 +4014,7 @@ do_get_default_source (const gchar** args) 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) diff --git a/standard-schemas/Makefile.am b/standard-schemas/Makefile.am index bf4b321a..37655e14 100644 --- a/standard-schemas/Makefile.am +++ b/standard-schemas/Makefile.am @@ -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) diff --git a/wrappers/cxx/Makefile.am b/wrappers/cxx/Makefile.am index 3301cadd..66a04a14 100644 --- a/wrappers/cxx/Makefile.am +++ b/wrappers/cxx/Makefile.am @@ -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 |