- updated for GConf2-2.7.3

Changed files:
    GConf2-NO_MAJOR_VERSION.patch -> 1.4.6.1

diff --git a/GConf2-NO_MAJOR_VERSION.patch b/GConf2-NO_MAJOR_VERSION.patch
index e47544658251ac5bbc93b5d1d47e4ba4b8410751..569308822fd20295dc911dd63c41bd8f643d8d48 100644 (file)
--- a/GConf2-NO_MAJOR_VERSION.patch
+++ b/GConf2-NO_MAJOR_VERSION.patch
@@ -17,9 +17,9 @@ diff -Nur GConf-1.2.1/gconf/Makefile.am GConf-1.2.1.new/gconf/Makefile.am
        -DG_LOG_DOMAIN=\"GConf\"                                        \
        -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\"                      \
          -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\"                   \
--      -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\"      \
-+      -DGCONF_CONFDIR=\""$(sysconfdir)/gconf"\"                       \
-       -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\"                        \
+-      -DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\"           \
++      -DGCONF_CONFDIR=\""$(sysgconfdir)"\"            \
+       -DGCONF_ETCDIR=\""$(sysgconfdir)"\"                             \
        -DGCONF_BINDIR=\""$(bindir)"\"                                  \
        -DGCONF_SERVERDIR=\""$(libexecdir)"\"           \
        -DGCONF_BUILDDIR=\""$(top_builddir)"\"                          \
@@ -41,10 +41,10 @@ diff -Nur GConf-1.2.1/gconf/Makefile.am GConf-1.2.1.new/gconf/Makefile.am
  EXTRA_DIST=GConf.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)/gconf
-+      $(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/path
+-      -mkdir -p $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
+-      $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
++      -mkdir -p $(DESTDIR)$(sysgconfdir)
++      $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/path
  
  gconfmarshal.h: @REBUILD@ stamp-gconfmarshal.h
        @true