# HG changeset patch
# User Eugene Paskevich <eugene@raptor.kiev.ua>
# Date 1192113642 -10800
# Node ID 6d33dffd13825f71633522216fab545d55750dea
# Parent  5d6cf50e905bb4f8dd0c2966aeb6f228d1b339f1
Curly vs round braces (part 1)

diff -r 5d6cf50e905b -r 6d33dffd1382 src/CoreAudio/Makefile
--- a/src/CoreAudio/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/CoreAudio/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -12,7 +12,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} -I../../intl -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
diff -r 5d6cf50e905b -r 6d33dffd1382 src/OSS/Makefile
--- a/src/OSS/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/OSS/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -11,7 +11,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${OSS_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. -I.
diff -r 5d6cf50e905b -r 6d33dffd1382 src/OSS4/Makefile
--- a/src/OSS4/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/OSS4/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -10,7 +10,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} -I/usr/lib/oss/include -I../../intl -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
diff -r 5d6cf50e905b -r 6d33dffd1382 src/aac/Makefile
--- a/src/aac/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/aac/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -52,7 +52,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS} -fsigned-char
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1
diff -r 5d6cf50e905b -r 6d33dffd1382 src/adplug/Makefile
--- a/src/adplug/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/adplug/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -56,7 +56,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
diff -r 5d6cf50e905b -r 6d33dffd1382 src/alac/Makefile
--- a/src/alac/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/alac/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -8,7 +8,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/alarm/Makefile
--- a/src/alarm/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/alarm/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -6,7 +6,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/alsa/Makefile
--- a/src/alsa/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/alsa/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -9,7 +9,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ALSA_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/amidi-plug/Makefile
--- a/src/amidi-plug/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/amidi-plug/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -22,4 +22,4 @@
 	-DAMIDIPLUGBACKENDDIR=\"$(plugindir)/$(AMIDIPLUG_BACKEND_DIR)\" -I../../intl -I../..
 LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS) $(GMODULE_LIBS) -lpthread ./pcfg/libpcfg.a
 
-plugindir := $(plugindir)/$(INPUT_PLUGIN_DIR)
+plugindir := ${plugindir}/$(INPUT_PLUGIN_DIR)
diff -r 5d6cf50e905b -r 6d33dffd1382 src/amidi-plug/backend-alsa/Makefile
--- a/src/amidi-plug/backend-alsa/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/amidi-plug/backend-alsa/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../../buildsys.mk
 include ../../../extra.mk
 
-plugindir := $(plugindir)/$(AMIDIPLUG_BACKEND_DIR)
+plugindir := ${plugindir}/$(AMIDIPLUG_BACKEND_DIR)
 
 CFLAGS += $(PLUGIN_CFLAGS) $(ALSA_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(ALSA_CFLAGS) $(GLIB_CFLAGS) -I../../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/amidi-plug/backend-dummy/Makefile
--- a/src/amidi-plug/backend-dummy/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/amidi-plug/backend-dummy/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../../buildsys.mk
 include ../../../extra.mk
 
-plugindir := $(plugindir)/$(AMIDIPLUG_BACKEND_DIR)
+plugindir := ${plugindir}/$(AMIDIPLUG_BACKEND_DIR)
 
 CFLAGS += $(PLUGIN_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GLIB_CFLAGS) -I../../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/amidi-plug/backend-fluidsynth/Makefile
--- a/src/amidi-plug/backend-fluidsynth/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/amidi-plug/backend-fluidsynth/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../../buildsys.mk
 include ../../../extra.mk
 
-plugindir := $(plugindir)/$(AMIDIPLUG_BACKEND_DIR)
+plugindir := ${plugindir}/$(AMIDIPLUG_BACKEND_DIR)
 
 CFLAGS += $(PLUGIN_CFLAGS) $(FLUIDSYNTH_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(FLUIDSYNTH_CFLAGS) $(GLIB_CFLAGS) -I../../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/aosd/Makefile
--- a/src/aosd/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/aosd/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -12,7 +12,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CAIRO_CFLAGS} ${PANGOCAIRO_CFLAGS} ${XRENDER_CFLAGS} ${XCOMPOSITE_CFLAGS} -I../../intl -I../.. -I..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/arts/Makefile
--- a/src/arts/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/arts/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -10,7 +10,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARTSC_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/audiocompress/Makefile
--- a/src/audiocompress/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/audiocompress/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -6,7 +6,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+plugindir := ${plugindir}/${EFFECT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/blur_scope/Makefile
--- a/src/blur_scope/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/blur_scope/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -6,7 +6,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+plugindir := ${plugindir}/${VISUALIZATION_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/cdaudio-ng/Makefile
--- a/src/cdaudio-ng/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/cdaudio-ng/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -6,7 +6,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CDIO_CFLAGS} ${CDDB_CFLAGS} ${ARCH_DEFINES} -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/console/Makefile
--- a/src/console/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/console/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -54,7 +54,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 LD = ${CXX}
 
diff -r 5d6cf50e905b -r 6d33dffd1382 src/cue/Makefile
--- a/src/cue/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/cue/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/curl/Makefile
--- a/src/curl/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/curl/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
+plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${CURL_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/daap/Makefile
--- a/src/daap/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/daap/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -7,7 +7,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/$(TRANSPORT_PLUGIN_DIR)
+plugindir := ${plugindir}/$(TRANSPORT_PLUGIN_DIR)
 
 #For the moment i'm hardcoding it but it will be configurable
 #MDNS_LIBS=-ldns_sd
diff -r 5d6cf50e905b -r 6d33dffd1382 src/dockalbumart/Makefile
--- a/src/dockalbumart/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/dockalbumart/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/echo_plugin/Makefile
--- a/src/echo_plugin/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/echo_plugin/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -6,7 +6,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+plugindir := ${plugindir}/${EFFECT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/esd/Makefile
--- a/src/esd/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/esd/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -10,7 +10,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ESD_CFLAGS} -I../../intl -I../.. -I..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/evdev-plug/Makefile
--- a/src/evdev-plug/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/evdev-plug/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -8,7 +8,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/filewriter/Makefile
--- a/src/filewriter/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/filewriter/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -9,7 +9,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/flacng/Makefile
--- a/src/flacng/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/flacng/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -8,7 +8,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${LIBFLAC_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/gnomeshortcuts/Makefile
--- a/src/gnomeshortcuts/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/gnomeshortcuts/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. -I..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/hotkey/Makefile
--- a/src/hotkey/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/hotkey/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. -I..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/jack/Makefile
--- a/src/jack/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/jack/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -7,7 +7,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${SAMPLERATE_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/ladspa/Makefile
--- a/src/ladspa/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/ladspa/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+plugindir := ${plugindir}/${EFFECT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/lastfm/Makefile
--- a/src/lastfm/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/lastfm/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
+plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${CURL_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/lirc/Makefile
--- a/src/lirc/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/lirc/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -6,7 +6,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/$(GENERAL_PLUGIN_DIR)
+plugindir := ${plugindir}/$(GENERAL_PLUGIN_DIR)
 
 CFLAGS += $(PLUGIN_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(MOWGLI_CFLAGS) $(PANGO_CFLAGS) $(DBUS_CFLAGS) -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/m3u/Makefile
--- a/src/m3u/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/m3u/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${CONTAINER_PLUGIN_DIR}
+plugindir := ${plugindir}/${CONTAINER_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../.. -Wall
diff -r 5d6cf50e905b -r 6d33dffd1382 src/madplug/Makefile
--- a/src/madplug/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/madplug/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -12,7 +12,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/metronom/Makefile
--- a/src/metronom/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/metronom/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/mms/Makefile
--- a/src/mms/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/mms/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
+plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${MMS_CFLAGS} -I../../intl -I../.. -Wall
 CFLAGS += ${PLUGIN_CFLAGS}
diff -r 5d6cf50e905b -r 6d33dffd1382 src/modplug/Makefile
--- a/src/modplug/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/modplug/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -49,7 +49,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
diff -r 5d6cf50e905b -r 6d33dffd1382 src/mtp_up/Makefile
--- a/src/mtp_up/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/mtp_up/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. ${MTP_CFLAGS}
diff -r 5d6cf50e905b -r 6d33dffd1382 src/musepack/Makefile
--- a/src/musepack/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/musepack/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CXXFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${TAGLIB_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/neon/Makefile
--- a/src/neon/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/neon/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -6,7 +6,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
+plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${NEON_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/null/Makefile
--- a/src/null/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/null/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${DBUS_CFLAGS} ${MOWGLI_CFLAGS} -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/paranormal/Makefile
--- a/src/paranormal/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/paranormal/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -26,7 +26,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+plugindir := ${plugindir}/${VISUALIZATION_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} -I../../intl -I../.. -I.
diff -r 5d6cf50e905b -r 6d33dffd1382 src/pls/Makefile
--- a/src/pls/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/pls/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -4,7 +4,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${CONTAINER_PLUGIN_DIR}
+plugindir := ${plugindir}/${CONTAINER_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/projectm-1.0/Makefile
--- a/src/projectm-1.0/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/projectm-1.0/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -8,7 +8,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+plugindir := ${plugindir}/${VISUALIZATION_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
diff -r 5d6cf50e905b -r 6d33dffd1382 src/projectm/Makefile
--- a/src/projectm/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/projectm/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -6,7 +6,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+plugindir := ${plugindir}/${VISUALIZATION_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} ${LIBPROJECTM_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/pulse_audio/Makefile
--- a/src/pulse_audio/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/pulse_audio/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${OUTPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/rocklight/Makefile
--- a/src/rocklight/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/rocklight/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -7,7 +7,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+plugindir := ${plugindir}/${VISUALIZATION_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/rootvis/Makefile
--- a/src/rootvis/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/rootvis/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -10,7 +10,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+plugindir := ${plugindir}/${VISUALIZATION_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${IMLIB2_CFLAGS} -I.
diff -r 5d6cf50e905b -r 6d33dffd1382 src/scrobbler/Makefile
--- a/src/scrobbler/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/scrobbler/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -16,7 +16,7 @@
 
 PACKAGE = audacious
 
-plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BEEP_DEFINES} ${CURL_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/sexypsf/Makefile
--- a/src/sexypsf/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/sexypsf/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -16,7 +16,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. -Ispu/ -I.
diff -r 5d6cf50e905b -r 6d33dffd1382 src/shnplug/Makefile
--- a/src/shnplug/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/shnplug/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -17,7 +17,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/$(INPUT_PLUGIN_DIR)
+plugindir := ${plugindir}/$(INPUT_PLUGIN_DIR)
 
 CFLAGS += $(PLUGIN_CFLAGS)
 LDFLAGS += $(AUDLDFLAGS)
diff -r 5d6cf50e905b -r 6d33dffd1382 src/sid/Makefile
--- a/src/sid/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/sid/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -21,7 +21,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
diff -r 5d6cf50e905b -r 6d33dffd1382 src/smb/Makefile
--- a/src/smb/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/smb/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
+plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/sndstretch/Makefile
--- a/src/sndstretch/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/sndstretch/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -6,7 +6,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+plugindir := ${plugindir}/${EFFECT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/song_change/Makefile
--- a/src/song_change/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/song_change/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/spectrum/Makefile
--- a/src/spectrum/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/spectrum/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+plugindir := ${plugindir}/${VISUALIZATION_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/statusicon/Makefile
--- a/src/statusicon/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/statusicon/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -8,7 +8,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+plugindir := ${plugindir}/${GENERAL_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/stdio/Makefile
--- a/src/stdio/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/stdio/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
+plugindir := ${plugindir}/${TRANSPORT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/stereo_plugin/Makefile
--- a/src/stereo_plugin/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/stereo_plugin/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+plugindir := ${plugindir}/${EFFECT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/sun/Makefile
--- a/src/sun/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/sun/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -10,7 +10,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+plugindir := ${plugindir}/$(OUTPUT_PLUGIN_DIR)
 
 CFLAGS += $(PLUGIN_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/timidity/Makefile
--- a/src/timidity/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/timidity/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -18,7 +18,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I./libtimidity
 CFLAGS += ${PLUGIN_CFLAGS}
diff -r 5d6cf50e905b -r 6d33dffd1382 src/tonegen/Makefile
--- a/src/tonegen/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/tonegen/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/tta/Makefile
--- a/src/tta/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/tta/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -6,7 +6,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/voice_removal/Makefile
--- a/src/voice_removal/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/voice_removal/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+plugindir := ${plugindir}/${EFFECT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/vorbis/Makefile
--- a/src/vorbis/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/vorbis/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -8,7 +8,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${OGG_VORBIS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
diff -r 5d6cf50e905b -r 6d33dffd1382 src/vtx/Makefile
--- a/src/vtx/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/vtx/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -11,7 +11,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../.. -I.
diff -r 5d6cf50e905b -r 6d33dffd1382 src/wav/Makefile
--- a/src/wav/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/wav/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -6,7 +6,7 @@
 
 include ../../buildsys.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. 
diff -r 5d6cf50e905b -r 6d33dffd1382 src/wavpack/Makefile
--- a/src/wavpack/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/wavpack/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -7,7 +7,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${WAVPACK_CFLAGS} -I../../intl -I../..
 CXXFLAGS += ${PLUGIN_CFLAGS}
diff -r 5d6cf50e905b -r 6d33dffd1382 src/wma/Makefile
--- a/src/wma/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/wma/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -24,7 +24,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+plugindir := ${plugindir}/${INPUT_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${SIMD_CFLAGS} -I../.. -I./libffwma -std=c99 ${GCC42_CFLAGS} -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE
diff -r 5d6cf50e905b -r 6d33dffd1382 src/xspf/Makefile
--- a/src/xspf/Makefile	Thu Oct 11 17:11:39 2007 +0300
+++ b/src/xspf/Makefile	Thu Oct 11 17:40:42 2007 +0300
@@ -5,7 +5,7 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-plugindir := $(plugindir)/${CONTAINER_PLUGIN_DIR}
+plugindir := ${plugindir}/${CONTAINER_PLUGIN_DIR}
 
 CFLAGS += ${PLUGIN_CFLAGS}
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..