From 28d96250c6965253d38291ac89e7d03a394df903 Mon Sep 17 00:00:00 2001 From: Bastien Nocera Date: Tue, 19 Oct 2010 14:21:53 +0100 Subject: [PATCH] gconf: Don't install schemas when GConf is disabled https://bugzilla.gnome.org/show_bug.cgi?id=632553 --- gconf/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gconf/Makefile.am b/gconf/Makefile.am index a4b43548e0..5129c00698 100644 --- a/gconf/Makefile.am +++ b/gconf/Makefile.am @@ -1,11 +1,14 @@ GST_SCHEMA_FILES = gstreamer-@GST_MAJORMINOR@.schemas +if USE_GCONF schemadir = @GCONF_SCHEMA_FILE_DIR@ schema_DATA = $(GST_SCHEMA_FILES) +endif gstreamer-@GST_MAJORMINOR@.schemas: gstreamer.schemas cp gstreamer.schemas gstreamer-@GST_MAJORMINOR@.schemas +if USE_GCONF if GCONF_SCHEMAS_INSTALL install-data-local: @GCONF_CONFIG_SOURCE=$(GCONF_SCHEMA_CONFIG_SOURCE) $(GCONFTOOL) \ @@ -22,6 +25,7 @@ install-data-local: @echo "***************************************************************" @true endif +endif # USE_GCONF CLEANFILES = $(GST_SCHEMA_FILES) EXTRA_DIST = $(GST_SCHEMA_FILES)