# HG changeset patch
# User giacomo
# Date 1161024044 25200
# Node ID 230d8b49db8be5f7d268cc9d9cb06309634c2b9a
# Parent  a793fb91ecde6402e1bef2a786b516893e06cb87
[svn] - do not use a different DATA_DIR for audacious-plugins

diff -r a793fb91ecde -r 230d8b49db8b ChangeLog
--- a/ChangeLog	Sun Oct 15 09:41:42 2006 -0700
+++ b/ChangeLog	Mon Oct 16 11:40:44 2006 -0700
@@ -1,3 +1,11 @@
+2006-10-15 16:41:42 +0000  William Pitcock <nenolod@nenolod.net>
+  revision [186]
+  - workaround for GNOME VFS crash
+  
+  trunk/src/mpg123/fileinfo.c |    4 ++++
+  1 file changed, 4 insertions(+)
+
+
 2006-10-13 04:13:45 +0000  Yoshiki Yazawa <yaz@cc.rim.or.jp>
   revision [184]
   - pls doesn't go along with PLAYLIST_LOCK in playlist_save().
diff -r a793fb91ecde -r 230d8b49db8b configure.ac
--- a/configure.ac	Sun Oct 15 09:41:42 2006 -0700
+++ b/configure.ac	Mon Oct 16 11:40:44 2006 -0700
@@ -1018,7 +1018,7 @@
 localedir="$datadir/locale"
 AC_SUBST(localedir)
 
-BEEP_DEFINES="$CFLAGS -DDATA_DIR=\\\"$datadir/audacious-plugins\\\" -DPLUGIN_DIR=\\\"$plugindir\\\" -DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\""
+BEEP_DEFINES="$CFLAGS -DDATA_DIR=\\\"$datadir/audacious\\\" -DPLUGIN_DIR=\\\"$plugindir\\\" -DPLUGINSUBS=$pluginsubs -DLOCALEDIR=\\\"$localedir\\\""
 CFLAGS="$CFLAGS $EXTRA_CFLAGS"
 
 if test "$enable_user_plugin_dir" = "no"; then
diff -r a793fb91ecde -r 230d8b49db8b src/scrobbler/Makefile
--- a/src/scrobbler/Makefile	Sun Oct 15 09:41:42 2006 -0700
+++ b/src/scrobbler/Makefile	Mon Oct 16 11:40:44 2006 -0700
@@ -5,7 +5,7 @@
 
 OBJECTIVE_LIBS = libscrobbler$(SHARED_SUFFIX)
 
-imagesdir = $(pkgdatadir)/images
+imagesdir = $(datadir)/audacious/images
 
 OBJECTIVE_DATA = audioscrobbler.png:$(imagesdir)	\
 	   audioscrobbler_badge.png:$(imagesdir)