summaryrefslogtreecommitdiff
path: root/src/xine-utils
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-utils')
-rw-r--r--src/xine-utils/Makefile.am2
-rw-r--r--src/xine-utils/utils.c7
2 files changed, 3 insertions, 6 deletions
diff --git a/src/xine-utils/Makefile.am b/src/xine-utils/Makefile.am
index a599f9b12..8a3d88ddd 100644
--- a/src/xine-utils/Makefile.am
+++ b/src/xine-utils/Makefile.am
@@ -12,7 +12,7 @@ endif
endif
AM_CFLAGS = $(X_CFLAGS) $(VISIBILITY_FLAG)
-AM_CPPFLAGS= $(PTHREAD_CFLAGS) -DXINE_LIBRARY_COMPILE
+AM_CPPFLAGS= -DXINE_LIBRARY_COMPILE
libxineutils_la_SOURCES = $(pppc_files) \
cpu_accel.c \
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;