summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--gconf/Makefile.am2
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 90a038dc..71370dcd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-08-15 Tim-Philipp Müller <tim at centricular dot net>
+
+ Patch by: Jens Granseuer <jensgr at gmx net>
+
+ * gconf/Makefile.am:
+ Make --disable-schemas work right (they still need
+ to be copied to the installation directory, just not
+ applied). Fixes #351347 (also #344100).
+
2006-08-14 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: back to HEAD
diff --git a/gconf/Makefile.am b/gconf/Makefile.am
index 18108007..eb17d388 100644
--- a/gconf/Makefile.am
+++ b/gconf/Makefile.am
@@ -1,9 +1,7 @@
GST_SCHEMA_FILES = gstreamer-@GST_MAJORMINOR@.schemas
-if GCONF_SCHEMAS_INSTALL
schemadir = @GCONF_SCHEMA_FILE_DIR@
schema_DATA = $(GST_SCHEMA_FILES)
-endif
gstreamer-@GST_MAJORMINOR@.schemas: gstreamer.schemas
cp gstreamer.schemas gstreamer-@GST_MAJORMINOR@.schemas