diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | data/Makefile.am | 4 |
2 files changed, 11 insertions, 2 deletions
@@ -1,4 +1,11 @@ -204-02-05 Christian Persch <chpe@cvs.gnome.org> +2004-02-06 Christian Persch <chpe@cvs.gnome.org> + + * data/Makefile.am: + + Honour the --with-gconf-schema-file-dir and --disable-schemas-install + configure options. Patch by Julio M. Merino Vidal, fixes bug #133533. + +2004-02-06 Christian Persch <chpe@cvs.gnome.org> * data/glade/prefs-dialog.glade: diff --git a/data/Makefile.am b/data/Makefile.am index 999810340..699ebd698 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -27,7 +27,7 @@ desktop_DATA = $(DESKTOP_FILES) applicationsdir = $(datadir)/application-registry applications_DATA = epiphany.applications -schemadir = $(sysconfdir)/gconf/schemas +schemadir = $(GCONF_SCHEMA_FILE_DIR) schema_in_files = epiphany.schemas.in epiphany-lockdown.schemas.in schema_DATA = epiphany.schemas epiphany-lockdown.schemas @@ -41,11 +41,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = epiphany-1.0.pc install-data-local: +if GCONF_SCHEMAS_INSTALL if test -z "$(DESTDIR)" ; then \ for p in $(schema_DATA) ; do \ GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) --makefile-install-rule $(top_builddir)/data/$$p; \ done \ fi +endif EXTRA_DIST = $(NAUTILUS_VIEW_SERVER) \ $(server_in_files) \ |