projects / packages / GConf2.git / blame
| Commit | Line | Data |
|---|---|---|
| 71e648d9 MB |
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 | |
| 4 | @@ -2,7 +2,7 @@ | |
| 5 | $(DEPENDENT_WITH_XML_CFLAGS) \ | |
| 6 | -DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\" | |
| 1882b2e6 | 7 | |
| 8 | -backenddir = $(pkglibdir)/$(MAJOR_VERSION) | |
| 9 | +backenddir = $(pkglibdir)$(MAJOR_VERSION) | |
| 10 | ||
| 71e648d9 MB |
11 | if LDAP_SUPPORT |
| 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 | |
| 16 | @@ -10,12 +10,12 @@ | |
| 17 | -DPREFIX=\""$(prefix)"\" \ | |
| 18 | -DGCONF_LOCALE_DIR=\""$(datadir)/locale"\" \ | |
| 1882b2e6 | 19 | -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \ |
| 3aad6cfe | 20 | - -DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\" \ |
| 21 | + -DGCONF_CONFDIR=\""$(sysgconfdir)"\" \ | |
| 22 | -DGCONF_ETCDIR=\""$(sysgconfdir)"\" \ | |
| 1882b2e6 | 23 | -DGCONF_BINDIR=\""$(bindir)"\" \ |
| 64d1766c | 24 | -DGCONF_SERVERDIR=\""$(libexecdir)"\" \ |
| 1882b2e6 | 25 | -DGCONF_BUILDDIR=\""$(top_builddir)"\" \ |
| 26 | - -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" \ | |
| 71e648d9 | 27 | + -DGCONF_BACKEND_DIR=\""$(pkglibdir)$(MAJOR_VERSION)"\" \ |
| 1882b2e6 | 28 | -DVERSION=\""$(VERSION)"\" \ |
| 29 | -DGCONF_ENABLE_INTERNALS=1 \ | |
| 71e648d9 MB |
30 | -DGCONFD=\""$(GCONFD_BINARY_NAME)$(EXEEXT)"\" \ |
| 31 | @@ -60,7 +60,7 @@ | |
| 1882b2e6 | 32 | gconf-engine.h \ |
| 33 | gconf-client.h | |
| 34 | ||
| 35 | -gconfincludedir = $(includedir)/gconf/$(MAJOR_VERSION)/gconf | |
| 85c1f078 | 36 | +gconfincludedir = $(includedir)/gconf$(MAJOR_VERSION)/gconf |
| 1882b2e6 | 37 | gconfinclude_HEADERS = \ |
| 38 | $(gconf_headers) \ | |
| 39 | gconf-enum-types.h | |
| 71e648d9 MB |
40 | @@ -128,15 +128,15 @@ |
| 41 | <$(srcdir)/default.path.in >default.path | |
| 1882b2e6 | 42 | |
| 7629d12a | 43 | install-data-local: default.path |
| 3aad6cfe | 44 | - $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION) |
| 71e648d9 | 45 | - if test -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; then \ |
| 3aad6cfe | 46 | + $(mkinstalldirs) $(DESTDIR)$(sysgconfdir) |
| 71e648d9 MB |
47 | + if test -f $(DESTDIR)$(sysgconfdir)/path; then \ |
| 48 | echo "Existing path configuration file not changed"; \ | |
| 49 | else \ | |
| 50 | - $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; \ | |
| 51 | + $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/path; \ | |
| 52 | fi | |
| 1882b2e6 | 53 | |
| 7629d12a | 54 | uninstall-local: |
| 71e648d9 MB |
55 | - rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path |
| 56 | + rm -f $(DESTDIR)$(sysgconfdir)/path | |
| 57 | ||
| 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 | |
| 63 | @@ -11,4 +11,4 @@ | |
| 64 | Requires: glib | |
| 65 | Requires.private: ORBit-2.0 | |
| 1882b2e6 | 66 | Libs: -L${libdir} -lgconf-@MAJOR_VERSION@ |
| 67 | -Cflags: -I${includedir}/gconf/@MAJOR_VERSION@ | |
| 68 | +Cflags: -I${includedir}/gconf@MAJOR_VERSION@ |