GConf2-NO_MAJOR_VERSION.patch

   1 --- GConf-1.1.8/backends/Makefile.am~   Wed Feb 20 21:05:23 2002
   2 +++ GConf-1.1.8/backends/Makefile.am    Wed Feb 20 21:05:23 2002
   3 @@ -4,7 +4,7 @@
   4
   5  EXTRA_DIST=README.bdb
   6
   7 -backenddir = $(pkglibdir)/$(MAJOR_VERSION)
   8 +backenddir = $(pkglibdir)$(MAJOR_VERSION)
   9
  10  if BDB
  11  BDBBACKEND=libgconfbackend-bdb.la
  12 --- GConf-1.1.8/gconf/Makefile.am~      Wed Feb 20 21:19:39 2002
  13 +++ GConf-1.1.8/gconf/Makefile.am       Wed Feb 20 21:19:39 2002
  14 @@ -9,11 +9,11 @@
  15         -DG_LOG_DOMAIN=\"GConf\"                                        \
  16         -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\"                      \
  17          -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\"                    \
  18 -       -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/$(MAJOR_VERSION)"\"      \
  19 +       -DGCONF_CONFDIR=\""$(sysconfdir)/gconf/"\"      \
  20         -DGCONF_ETCDIR=\""$(sysconfdir)/gconf"\"                        \
  21         -DGCONF_BINDIR=\""$(bindir)"\"                                  \
  22         -DGCONF_BUILDDIR=\""$(top_builddir)"\"                          \
  23 -       -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\"         \
  24 +       -DGCONF_BACKEND_DIR=\""$(pkglibdir)$(MAJOR_VERSION)"\"          \
  25         -DVERSION=\""$(VERSION)"\"                                      \
  26         -DGCONF_ENABLE_INTERNALS=1                                      \
  27         -DGCONFD=\""$(GCONFD_BINARY_NAME)"\"                            \
  28 @@ -61,7 +61,7 @@
  29         gconf-engine.h          \
  30         gconf-client.h
  31
  32 -gconfincludedir = $(includedir)/gconf/$(MAJOR_VERSION)/gconf
  33 +gconfincludedir = $(includedir)/gconf$(MAJOR_VERSION)
  34  gconfinclude_HEADERS =                 \
  35         $(gconf_headers)        \
  36         gconf-enum-types.h
  37 @@ -120,8 +120,8 @@
  38  EXTRA_DIST=GConf.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
  39
  40  install-data-local:
  41 -       -mkdir -p $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)
  42 -       $(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/$(MAJOR_VERSION)/path
  43 +       -mkdir -p $(DESTDIR)$(sysconfdir)/gconf/
  44 +       $(INSTALL_DATA) default.path $(DESTDIR)$(sysconfdir)/gconf/path
  45
  46  gconfmarshal.h: @REBUILD@ stamp-gconfmarshal.h
  47         @true
  48 --- GConf-1.1.8/gconf-2.0.pc.in~        Wed Feb 20 21:43:34 2002
  49 +++ GConf-1.1.8/gconf-2.0.pc.in Wed Feb 20 21:43:34 2002
  50 @@ -9,4 +9,4 @@
  51  Version: @VERSION@
  52  Requires: ORBit-2.0
  53  Libs: -L${libdir} -lgconf-@MAJOR_VERSION@
  54 -Cflags: -I${includedir}/gconf/@MAJOR_VERSION@
  55 +Cflags: -I${includedir}/gconf@MAJOR_VERSION@