1 diff -urN GConf-2.21.1/backends/Makefile.am GConf-2.21.1.new/backends/Makefile.am
2 --- GConf-2.21.1/backends/Makefile.am 2007-06-25 13:11:19.000000000 +0200
3 +++ GConf-2.21.1.new/backends/Makefile.am 2008-01-09 18:35:59.000000000 +0100
5 $(DEPENDENT_WITH_XML_CFLAGS) \
6 -DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\"
8 -backenddir = $(pkglibdir)/$(MAJOR_VERSION)
9 +backenddir = $(pkglibdir)$(MAJOR_VERSION)
12 EVOLDAP_BACKEND = libgconfbackend-evoldap.la
13 diff -urN GConf-2.21.1/gconf/Makefile.am GConf-2.21.1.new/gconf/Makefile.am
14 --- GConf-2.21.1/gconf/Makefile.am 2007-11-01 20:35:40.000000000 +0100
15 +++ GConf-2.21.1.new/gconf/Makefile.am 2008-01-09 18:38:09.000000000 +0100
17 -DPREFIX=\""$(prefix)"\" \
18 -DGCONF_LOCALE_DIR=\""$(datadir)/locale"\" \
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)$(EXEEXT)"\" \
35 -gconfincludedir = $(includedir)/gconf/$(MAJOR_VERSION)/gconf
36 +gconfincludedir = $(includedir)/gconf$(MAJOR_VERSION)/gconf
37 gconfinclude_HEADERS = \
41 <$(srcdir)/default.path.in >default.path
43 install-data-local: default.path
44 - $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)
45 - if test -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; then \
46 + $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)
47 + if test -f $(DESTDIR)$(sysgconfdir)/path; then \
48 echo "Existing path configuration file not changed"; \
50 - $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; \
51 + $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/path; \
55 - rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path
56 + rm -f $(DESTDIR)$(sysgconfdir)/path
58 gconfmarshal.h: gconfmarshal.list $(GLIB_GENMARSHAL)
59 $(GLIB_GENMARSHAL) $< --header --prefix=gconf_marshal > $@
60 diff -urN GConf-2.21.1/gconf-2.0.pc.in GConf-2.21.1.new/gconf-2.0.pc.in
61 --- GConf-2.21.1/gconf-2.0.pc.in 2008-01-08 15:43:09.000000000 +0100
62 +++ GConf-2.21.1.new/gconf-2.0.pc.in 2008-01-09 18:38:43.000000000 +0100
65 Requires.private: ORBit-2.0
66 Libs: -L${libdir} -lgconf-@MAJOR_VERSION@
67 -Cflags: -I${includedir}/gconf/@MAJOR_VERSION@
68 +Cflags: -I${includedir}/gconf@MAJOR_VERSION@