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
7 -backenddir = $(pkglibdir)/$(MAJOR_VERSION)
8 +backenddir = $(pkglibdir)$(MAJOR_VERSION)
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
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)"\" \
32 -gconfincludedir = $(includedir)/gconf/$(MAJOR_VERSION)/gconf
33 +gconfincludedir = $(includedir)/gconf$(MAJOR_VERSION)/gconf
34 gconfinclude_HEADERS = \
38 EXTRA_DIST=GConf.idl default.path.in gconfmarshal.list regenerate-enum-header.sh regenerate-enum-footer.sh
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
46 gconfmarshal.h: @REBUILD@ stamp-gconfmarshal.h
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
53 Libs: -L${libdir} -lgconf-@MAJOR_VERSION@
54 -Cflags: -I${includedir}/gconf/@MAJOR_VERSION@
55 +Cflags: -I${includedir}/gconf@MAJOR_VERSION@