GConf2-NO_MAJOR_VERSION.patch

   1 diff -Nur GConf-1.2.1/backends/Makefile.am GConf-1.2.1.new/backends/Makefile.am
   2 --- GConf-1.2.1/backends/Makefile.am    Wed Jun 12 22:32:12 2002
   3 +++ GConf-1.2.1.new/backends/Makefile.am        Thu Aug 15 02:19:08 2002
   4 @@ -4,7 +4,7 @@
   5
   6  EXTRA_DIST=README.bdb
   7
   8 -backenddir = $(pkglibdir)/$(MAJOR_VERSION)
   9 +backenddir = $(pkglibdir)$(MAJOR_VERSION)
  10
  11  if BDB
  12  BDBBACKEND=libgconfbackend-bdb.la
  13 diff -Nur GConf-1.2.1/gconf/Makefile.am GConf-1.2.1.new/gconf/Makefile.am
  14 --- GConf-1.2.1/gconf/Makefile.am       Tue Jul 23 19:14:07 2002
  15 +++ GConf-1.2.1.new/gconf/Makefile.am   Thu Aug 15 02:21:59 2002
  16 @@ -9,12 +9,12 @@
  17         -DG_LOG_DOMAIN=\"GConf\"                                        \
  18         -DGCONF_LOCALE_DIR=\""$(gconflocaledir)"\"                      \
  19          -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\"                    \
  20 -       -DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\"           \
  21 +       -DGCONF_CONFDIR=\""$(sysgconfdir)"\"            \
  22         -DGCONF_ETCDIR=\""$(sysgconfdir)"\"                             \
  23         -DGCONF_BINDIR=\""$(bindir)"\"                                  \
  24         -DGCONF_SERVERDIR=\""$(libexecdir)"\"           \
  25         -DGCONF_BUILDDIR=\""$(top_builddir)"\"                          \
  26 -       -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\"         \
  27 +       -DGCONF_BACKEND_DIR=\""$(pkglibdir)$(MAJOR_VERSION)"\"                          \
  28         -DVERSION=\""$(VERSION)"\"                                      \
  29         -DGCONF_ENABLE_INTERNALS=1                                      \
  30         -DGCONFD=\""$(GCONFD_BINARY_NAME)"\"                            \
  31 @@ -63,7 +63,7 @@
  32         gconf-engine.h          \
  33         gconf-client.h
  34
  35 -gconfincludedir = $(includedir)/gconf/$(MAJOR_VERSION)/gconf
  36 +gconfincludedir = $(includedir)/gconf$(MAJOR_VERSION)/gconf
  37  gconfinclude_HEADERS =                 \
  38         $(gconf_headers)        \
  39         gconf-enum-types.h
  40 @@ -122,8 +122,8 @@
  41  EXTRA_DIST=GConf.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
  42
  43  install-data-local: default.path
  44 -       $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
  45 -       $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
  46 +       $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)
  47 +       $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/path
  48
  49  uninstall-local:
  50         rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
  51 diff -Nur GConf-1.2.1/gconf-2.0.pc.in GConf-1.2.1.new/gconf-2.0.pc.in
  52 --- GConf-1.2.1/gconf-2.0.pc.in Tue Jul 23 19:14:07 2002
  53 +++ GConf-1.2.1.new/gconf-2.0.pc.in     Thu Aug 15 02:19:08 2002
  54 @@ -10,4 +10,4 @@
  55  Version: @VERSION@
  56  Requires: ORBit-2.0
  57  Libs: -L${libdir} -lgconf-@MAJOR_VERSION@
  58 -Cflags: -I${includedir}/gconf/@MAJOR_VERSION@
  59 +Cflags: -I${includedir}/gconf@MAJOR_VERSION@