projects / packages / GConf2.git / blame
| Commit | Line | Data |
|---|---|---|
| c783336d KM |
1 | --- GConf-3.2.6/backends/Makefile.am.orig 2011-08-16 02:59:31.000000000 +0000 |
| 2 | +++ GConf-3.2.6/backends/Makefile.am 2022-11-10 09:34:27.690733736 +0000 | |
| 3 | @@ -3,7 +3,7 @@ | |
| 4 | $(DEPENDENT_ORBIT_CFLAGS) \ | |
| 71e648d9 | 5 | -DGCONF_ENABLE_INTERNALS=1 -DG_LOG_DOMAIN=\"GConf-Backends\" |
| 1882b2e6 | 6 | |
| 7 | -backenddir = $(pkglibdir)/$(MAJOR_VERSION) | |
| 8 | +backenddir = $(pkglibdir)$(MAJOR_VERSION) | |
| 9 | ||
| 71e648d9 MB |
10 | if LDAP_SUPPORT |
| 11 | EVOLDAP_BACKEND = libgconfbackend-evoldap.la | |
| c783336d KM |
12 | --- GConf-3.2.6/gconf/Makefile.am.orig 2013-01-22 01:09:35.000000000 +0000 |
| 13 | +++ GConf-3.2.6/gconf/Makefile.am 2022-11-10 09:34:27.690733736 +0000 | |
| 14 | @@ -12,12 +12,12 @@ | |
| 71e648d9 MB |
15 | -DPREFIX=\""$(prefix)"\" \ |
| 16 | -DGCONF_LOCALE_DIR=\""$(datadir)/locale"\" \ | |
| 1882b2e6 | 17 | -DGCONF_SRCDIR=\""$(absolute_top_srcdir)"\" \ |
| 3aad6cfe | 18 | - -DGCONF_CONFDIR=\""$(sysgconfdir)/$(MAJOR_VERSION)"\" \ |
| 19 | + -DGCONF_CONFDIR=\""$(sysgconfdir)"\" \ | |
| 20 | -DGCONF_ETCDIR=\""$(sysgconfdir)"\" \ | |
| 1882b2e6 | 21 | -DGCONF_BINDIR=\""$(bindir)"\" \ |
| 64d1766c | 22 | -DGCONF_SERVERDIR=\""$(libexecdir)"\" \ |
| 1882b2e6 | 23 | -DGCONF_BUILDDIR=\""$(top_builddir)"\" \ |
| 24 | - -DGCONF_BACKEND_DIR=\""$(pkglibdir)/$(MAJOR_VERSION)"\" \ | |
| 71e648d9 | 25 | + -DGCONF_BACKEND_DIR=\""$(pkglibdir)$(MAJOR_VERSION)"\" \ |
| 1882b2e6 | 26 | -DVERSION=\""$(VERSION)"\" \ |
| 27 | -DGCONF_ENABLE_INTERNALS=1 \ | |
| 71e648d9 | 28 | -DGCONFD=\""$(GCONFD_BINARY_NAME)$(EXEEXT)"\" \ |
| c783336d | 29 | @@ -59,7 +59,7 @@ |
| 1882b2e6 | 30 | gconf-engine.h \ |
| 31 | gconf-client.h | |
| 32 | ||
| 33 | -gconfincludedir = $(includedir)/gconf/$(MAJOR_VERSION)/gconf | |
| 85c1f078 | 34 | +gconfincludedir = $(includedir)/gconf$(MAJOR_VERSION)/gconf |
| 1882b2e6 | 35 | gconfinclude_HEADERS = \ |
| 36 | $(gconf_headers) \ | |
| 37 | gconf-enum-types.h | |
| c783336d KM |
38 | @@ -175,15 +175,15 @@ |
| 39 | service_DATA = org.gnome.GConf.service | |
| 1882b2e6 | 40 | |
| 7629d12a | 41 | install-data-local: default.path |
| 3aad6cfe | 42 | - $(mkinstalldirs) $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION) |
| 71e648d9 | 43 | - if test -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; then \ |
| 3aad6cfe | 44 | + $(mkinstalldirs) $(DESTDIR)$(sysgconfdir) |
| 71e648d9 MB |
45 | + if test -f $(DESTDIR)$(sysgconfdir)/path; then \ |
| 46 | echo "Existing path configuration file not changed"; \ | |
| 47 | else \ | |
| 48 | - $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path; \ | |
| 49 | + $(INSTALL_DATA) default.path $(DESTDIR)$(sysgconfdir)/path; \ | |
| 50 | fi | |
| 1882b2e6 | 51 | |
| 7629d12a | 52 | uninstall-local: |
| 71e648d9 MB |
53 | - rm -f $(DESTDIR)$(sysgconfdir)/$(MAJOR_VERSION)/path |
| 54 | + rm -f $(DESTDIR)$(sysgconfdir)/path | |
| 55 | ||
| 56 | gconfmarshal.h: gconfmarshal.list $(GLIB_GENMARSHAL) | |
| 57 | $(GLIB_GENMARSHAL) $< --header --prefix=gconf_marshal > $@ | |
| c783336d KM |
58 | --- GConf-3.2.6/gconf-2.0.pc.in.orig 2011-08-16 02:59:31.000000000 +0000 |
| 59 | +++ GConf-3.2.6/gconf-2.0.pc.in 2022-11-10 09:34:27.690733736 +0000 | |
| 71e648d9 | 60 | @@ -11,4 +11,4 @@ |
| c783336d KM |
61 | Requires: glib-2.0 |
| 62 | Requires.private: @IPC_REQUIRES@ gio-2.0 | |
| 1882b2e6 | 63 | Libs: -L${libdir} -lgconf-@MAJOR_VERSION@ |
| 64 | -Cflags: -I${includedir}/gconf/@MAJOR_VERSION@ | |
| 65 | +Cflags: -I${includedir}/gconf@MAJOR_VERSION@ |