summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Schmidt <thaytan@mad.scientist.com>2007-03-01 17:27:34 +0000
committerJan Schmidt <thaytan@mad.scientist.com>2007-03-01 17:27:34 +0000
commit59a7603e1eab791201f10c196e027a5b1541241c (patch)
tree378c30c748f0a3db00db2f1880470840070300c1
parent24d163b50b03d6c0e3ad568016c171194ad5e679 (diff)
downloadgst-plugins-bad-59a7603e1eab791201f10c196e027a5b1541241c.tar.gz
gst-plugins-bad-59a7603e1eab791201f10c196e027a5b1541241c.tar.bz2
gst-plugins-bad-59a7603e1eab791201f10c196e027a5b1541241c.zip
tests/check/Makefile.am: Draw plugins in from the build tree sys/ dir, rather than picking up the already installed v...
Original commit message from CVS: * tests/check/Makefile.am: Draw plugins in from the build tree sys/ dir, rather than picking up the already installed versions.
-rw-r--r--ChangeLog6
m---------common0
-rw-r--r--tests/check/Makefile.am2
3 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 72b0ace3..90d906e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-03-01 Jan Schmidt <thaytan@mad.scientist.com>
+
+ * tests/check/Makefile.am:
+ Draw plugins in from the build tree sys/ dir, rather than
+ picking up the already installed versions.
+
2007-02-28 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac:
diff --git a/common b/common
-Subproject 54c2a701c28dcddaf051abf09a360223acd096c
+Subproject 9a56e28fc15440eb6852411321c46312e1d1bb7
diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am
index b086f354..bb2540f9 100644
--- a/tests/check/Makefile.am
+++ b/tests/check/Makefile.am
@@ -12,7 +12,7 @@ REGISTRY_ENVIRONMENT = \
TESTS_ENVIRONMENT = \
$(REGISTRY_ENVIRONMENT) \
GST_PLUGIN_SYSTEM_PATH= \
- GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/ext:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)
+ GST_PLUGIN_PATH=$(top_builddir)/gst:$(top_builddir)/sys:$(top_builddir)/ext:$(GSTPB_PLUGINS_DIR):$(GST_PLUGINS_DIR)
plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@