diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/xine-utils/utils.c | 7 |
2 files changed, 4 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac index b3a9d7079..e8abfc211 100644 --- a/configure.ac +++ b/configure.ac @@ -2458,7 +2458,8 @@ else AC_DEFINE_UNQUOTED(XINE_FONTDIR,"$XINE_FONTPATH",[Define this to osd fonts dir location]) AC_DEFINE_UNQUOTED(XINE_LOCALEDIR, "$XINE_LOCALEPATH",[Path where catalog files will be.]) fi -AC_DEFINE_UNQUOTED(XINE_REL_PLUGINDIR,"$XINE_REL_PLUGINDIR",[Define this to plugin directory relative to execution prefix]) +AC_DEFINE_UNQUOTED(XINE_REL_PLUGINDIR,"$XINE_REL_PLUGINDIR",[Define this to specific plugin directory relative to execution prefix]) +AC_DEFINE_UNQUOTED(XINE_REL_PLUGINROOT,"$XINE_REL_PLUGINROOT",[Define this to general plugin directory relative to execution prefix]) AC_DEFINE_UNQUOTED(XINE_REL_FONTDIR,"$XINE_REL_FONTDIR",[Define this to font directory relative to prefix]) AC_DEFINE_UNQUOTED(XINE_REL_LOCALEDIR,"$XINE_REL_LOCALEDIR",[Define this to font directory relative to prefix]) AC_SUBST(XINE_CONFIG_PREFIX) diff --git a/src/xine-utils/utils.c b/src/xine-utils/utils.c index f533d69e5..57a92623c 100644 --- a/src/xine-utils/utils.c +++ b/src/xine-utils/utils.c @@ -393,11 +393,8 @@ const char *xine_get_pluginroot(void) { static char pluginroot[1024] = {0, }; if (!pluginroot[0]) { - char *sep, *sep2; - strcpy (pluginroot, xine_get_plugindir ()); - sep = strrchr (pluginroot, '/'); - sep2 = strrchr (pluginroot, '\\'); - *(sep < sep2 ? sep : sep2) = 0; + xine_get_rootdir(pluginroot, sizeof(pluginroot) - strlen(XINE_REL_PLUGINROOT) - 1); + strcat(pluginroot, XINE_DIRECTORY_SEPARATOR_STRING XINE_REL_PLUGINROOT); } return pluginroot; |