summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndoni Morales Alastruey <ylatuya@gmail.com>2013-06-28 12:25:59 +0200
committerTim-Philipp Müller <tim@centricular.net>2013-07-06 00:44:52 +0100
commit166ffd5f0b4952a18c807ebfcaa2f069534a5bc9 (patch)
treed178dd4428db7877004296346ed065b2a7b16730
parenteefd68a008385886156949c7a2bde674df45b8bb (diff)
downloadgstreamer-plugins-bad-166ffd5f0b4952a18c807ebfcaa2f069534a5bc9.tar.gz
frei0r: add the build prefix path in the search dirs
-rw-r--r--gst/frei0r/gstfrei0r.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/gst/frei0r/gstfrei0r.c b/gst/frei0r/gstfrei0r.c
index 8cd8f1309..98a0eec17 100644
--- a/gst/frei0r/gstfrei0r.c
+++ b/gst/frei0r/gstfrei0r.c
@@ -659,7 +659,7 @@ static gboolean
plugin_init (GstPlugin * plugin)
{
const gchar *homedir;
- gchar *path;
+ gchar *path, *libdir_path;
GHashTable *plugin_names;
const gchar *frei0r_path;
@@ -667,6 +667,7 @@ plugin_init (GstPlugin * plugin)
gst_plugin_add_dependency_simple (plugin,
"FREI0R_PATH:HOME/.frei0r-1/lib",
+ LIBDIR "/frei0r-1:"
"/usr/lib/frei0r-1:/usr/local/lib/frei0r-1:"
"/usr/lib32/frei0r-1:/usr/local/lib32/frei0r-1:"
"/usr/lib64/frei0r-1:/usr/local/lib64/frei0r-1",
@@ -689,8 +690,11 @@ plugin_init (GstPlugin * plugin)
#define register_plugins2(plugin, pn, p) register_plugins(plugin, pn, p, p)
homedir = g_get_home_dir ();
path = g_build_filename (homedir, ".frei0r-1", "lib", NULL);
+ libdir_path = g_build_filename (LIBDIR, "frei0r-1", NULL);
register_plugins2 (plugin, plugin_names, path);
g_free (path);
+ register_plugins2 (plugin, plugin_names, libdir_path);
+ g_free (libdir_path);
register_plugins2 (plugin, plugin_names, "/usr/local/lib/frei0r-1");
register_plugins2 (plugin, plugin_names, "/usr/lib/frei0r-1");
register_plugins2 (plugin, plugin_names, "/usr/local/lib32/frei0r-1");