From 42a1b1e7562413fc889311c1b6f6e46eed7fd163 Mon Sep 17 00:00:00 2001 From: Tim-Philipp Müller Date: Fri, 9 Jun 2006 20:36:00 +0000 Subject: gconf/Makefile.am: Honour --disable-schemas-install configure option. Fixes #344100. Original commit message from CVS: * gconf/Makefile.am: Honour --disable-schemas-install configure option. Fixes #344100. --- ChangeLog | 5 +++++ gconf/Makefile.am | 18 +++++++++++++++--- 2 files changed, 20 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5c1dec6d..75d28941 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-06-09 Tim-Philipp Müller + + * gconf/Makefile.am: + Honour --disable-schemas-install configure option. Fixes #344100. + 2006-06-09 Tim-Philipp Müller * tests/examples/level/Makefile.am: diff --git a/gconf/Makefile.am b/gconf/Makefile.am index 660a66e3..18108007 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -1,9 +1,14 @@ +GST_SCHEMA_FILES = gstreamer-@GST_MAJORMINOR@.schemas + +if GCONF_SCHEMAS_INSTALL schemadir = @GCONF_SCHEMA_FILE_DIR@ -schema_DATA = gstreamer-@GST_MAJORMINOR@.schemas +schema_DATA = $(GST_SCHEMA_FILES) +endif gstreamer-@GST_MAJORMINOR@.schemas: gstreamer.schemas cp gstreamer.schemas gstreamer-@GST_MAJORMINOR@.schemas +if GCONF_SCHEMAS_INSTALL install-data-local: @GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \ --makefile-install-rule $(srcdir)/$(schema_DATA) || \ @@ -12,6 +17,13 @@ install-data-local: echo "Installation of schemas failed, install them manually"; \ echo "*****************************************************";) @true +else +install-data-local: + @echo "***************************************************************" + @echo "Not installing schemas, disabled with --disable-schemas-install" + @echo "***************************************************************" + @true +endif -CLEANFILES = $(schema_DATA) -EXTRA_DIST = $(schema_DATA) +CLEANFILES = $(GST_SCHEMA_FILES) +EXTRA_DIST = $(GST_SCHEMA_FILES) -- cgit