From 051f04fb933e3000cb7b23ccd922769a244334c6 Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Sun, 25 Sep 2011 12:45:58 -0700 Subject: [PATCH] Add relative frei0r and LADSPA dirs for relocatable. --- src/modules/frei0r/factory.c | 2 +- src/modules/jackrack/plugin_mgr.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/frei0r/factory.c b/src/modules/frei0r/factory.c index 8be2b0f1..d7b39e29 100644 --- a/src/modules/frei0r/factory.c +++ b/src/modules/frei0r/factory.c @@ -37,7 +37,7 @@ #define FREI0R_PLUGIN_PATH "lib\\frei0r-1" #else #define LIBSUF ".so" -#define FREI0R_PLUGIN_PATH "/usr/lib/frei0r-1:/usr/lib64/frei0r-1:/opt/local/lib/frei0r-1:/usr/local/lib/frei0r-1:$HOME/.frei0r-1/lib" +#define FREI0R_PLUGIN_PATH "lib/frei0r-1:/usr/lib/frei0r-1:/usr/lib64/frei0r-1:/opt/local/lib/frei0r-1:/usr/local/lib/frei0r-1:$HOME/.frei0r-1/lib" #endif #define GET_FREI0R_PATH (getenv("FREI0R_PATH") ? getenv("FREI0R_PATH") : getenv("MLT_FREI0R_PLUGIN_PATH") ? getenv("MLT_FREI0R_PLUGIN_PATH") : FREI0R_PLUGIN_PATH) diff --git a/src/modules/jackrack/plugin_mgr.c b/src/modules/jackrack/plugin_mgr.c index 032d78f3..6a28a294 100644 --- a/src/modules/jackrack/plugin_mgr.c +++ b/src/modules/jackrack/plugin_mgr.c @@ -216,7 +216,7 @@ plugin_mgr_get_path_plugins (plugin_mgr_t * plugin_mgr) #ifdef WIN32 ladspa_path = g_strdup ("lib\\ladspa"); #else - ladspa_path = g_strdup ("/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/lib64/ladspa"); + ladspa_path = g_strdup ("lib/ladspa:/usr/local/lib/ladspa:/usr/lib/ladspa:/usr/lib64/ladspa"); #endif dir = strtok (ladspa_path, ":"); -- 2.39.2