# HG changeset patch
# User Eugene Paskevich <eugene@raptor.kiev.ua>
# Date 1191969613 -10800
# Node ID a56a26a5f233069a66c240a1594798fc156634b8
# Parent  e2904348f1543d4ff0f5a8ffa5a7533831b8cf52
Revised the plugindir logic.

diff -r e2904348f154 -r a56a26a5f233 buildsys.mk.in
--- a/buildsys.mk.in	Tue Oct 09 22:39:32 2007 +0300
+++ b/buildsys.mk.in	Wed Oct 10 01:40:13 2007 +0300
@@ -58,7 +58,7 @@
 exec_prefix = @exec_prefix@
 bindir = @bindir@
 libdir = @libdir@
-plugindir ?= ${PACKAGE}
+plugindir = @plugindir@
 datarootdir = @datarootdir@
 datadir = @datadir@
 includedir = @includedir@
@@ -220,7 +220,7 @@
 
 	for i in ${PLUGIN}; do \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${libdir}/${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/${plugindir}/$$i; then \
+		if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
@@ -293,15 +293,15 @@
 	done
 
 	for i in ${PLUGIN}; do \
-		if test -f ${DESTDIR}${libdir}/${plugindir}/$$i; then \
-			if rm -f ${DESTDIR}${libdir}/${plugindir}/$$i; then \
+		if test -f ${DESTDIR}${plugindir}/$$i; then \
+			if rm -f ${DESTDIR}${plugindir}/$$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
 			fi \
 		fi \
 	done
-	-rmdir ${DESTDIR}${libdir}/${plugindir} >/dev/null 2>&1
+	-rmdir ${plugindir} >/dev/null 2>&1
 
 	for i in ${DATA}; do \
 		if test -f ${DESTDIR}${datadir}/${PACKAGE}/$$i; then \
diff -r e2904348f154 -r a56a26a5f233 extra.mk.in
--- a/extra.mk.in	Tue Oct 09 22:39:32 2007 +0300
+++ b/extra.mk.in	Wed Oct 10 01:40:13 2007 +0300
@@ -315,7 +315,6 @@
 mandir ?= @mandir@
 mkdir_p ?= @mkdir_p@
 oldincludedir ?= @oldincludedir@
-plugindir ?= @plugindir@
 pluginsubs ?= @pluginsubs@
 prefix ?= @prefix@
 program_transform_name ?= @program_transform_name@
diff -r e2904348f154 -r a56a26a5f233 src/CoreAudio/Makefile
--- a/src/CoreAudio/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/CoreAudio/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -8,11 +8,11 @@
        dbconvert.c	\
        mixer.c
 
-plugindir = audacious/${OUTPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} -I../../intl -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/OSS/Makefile
--- a/src/OSS/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/OSS/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -7,11 +7,11 @@
        init.c		\
        convert.c
 
-plugindir = audacious/${OUTPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${OSS_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. -I.
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${OSS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/OSS4/Makefile
--- a/src/OSS4/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/OSS4/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -6,11 +6,11 @@
        init.c		\
        convert.c
 
-plugindir = audacious/${OUTPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} -I/usr/lib/oss/include -I../../intl -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${OSS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/aac/Makefile
--- a/src/aac/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/aac/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -48,11 +48,11 @@
        mp4ff/mp4util.c		\
        mp4ff/mp4tagupdate.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I. -I./include -I./libfaad2 -I./mp4ff -DUSE_TAGGING=1
 CFLAGS += ${PLUGIN_CFLAGS} -fsigned-char
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} -lm
diff -r e2904348f154 -r a56a26a5f233 src/adplug/Makefile
--- a/src/adplug/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/adplug/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -52,11 +52,11 @@
        core/adl.cxx		\
        core/jbm.cxx
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 LD = ${CXX}
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BINIO_CFLAGS} -I../../intl -I../.. -I./core -Dstricmp=strcasecmp
diff -r e2904348f154 -r a56a26a5f233 src/alac/Makefile
--- a/src/alac/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/alac/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -4,11 +4,11 @@
        plugin.c	\
        stream.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/alarm/Makefile
--- a/src/alarm/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/alarm/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -2,11 +2,11 @@
 SRCS = alarm.c	\
        interface.c
 
-plugindir = audacious/${GENERAL_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/alsa/Makefile
--- a/src/alsa/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/alsa/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -5,11 +5,11 @@
        configure.c	\
        init.c
 
-plugindir = audacious/${OUTPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ALSA_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${ALSA_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/amidi-plug/Makefile
--- a/src/amidi-plug/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/amidi-plug/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -9,8 +9,6 @@
                  amidi-plug-icon.xpm amidi-plug.logo.xpm \
                  amidi-plug.midiicon.xpm
 
-plugindir = audacious/$(INPUT_PLUGIN_DIR)
-
 SRCS = amidi-plug.c i_vfslayer.c i_midi.c i_backend.c \
           i_configure.c i_configure-ap.c i_configure-alsa.c \
           i_configure-fluidsynth.c i_configure-dummy.c \
@@ -25,6 +23,8 @@
 
 CFLAGS += $(PLUGIN_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) $(GMODULE_CFLAGS) $(MOWGLI_CFLAGS) \
-	-DAMIDIPLUGBACKENDDIR=\"$(libdir)/audacious/$(AMIDIPLUG_BACKEND_DIR)\" -I../../intl -I../..
+	-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)
diff -r e2904348f154 -r a56a26a5f233 src/amidi-plug/backend-alsa/Makefile
--- a/src/amidi-plug/backend-alsa/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/amidi-plug/backend-alsa/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,6 +1,4 @@
 PLUGIN = ap-alsa$(PLUGIN_SUFFIX)
-plugindir = audacious/$(AMIDIPLUG_BACKEND_DIR)
-
 noinst_HEADERS = b-alsa.h b-alsa-config.h backend-alsa-icon.xpm
 
 SRCS = b-alsa.c
@@ -8,6 +6,8 @@
 include ../../../buildsys.mk
 include ../../../extra.mk
 
+plugindir := $(plugindir)/$(AMIDIPLUG_BACKEND_DIR)
+
 CFLAGS += $(PLUGIN_CFLAGS) $(ALSA_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(ALSA_CFLAGS) $(GLIB_CFLAGS) -I../../..
 LIBS += $(ALSA_LIBS) ../pcfg/libpcfg.a
diff -r e2904348f154 -r a56a26a5f233 src/amidi-plug/backend-dummy/Makefile
--- a/src/amidi-plug/backend-dummy/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/amidi-plug/backend-dummy/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,6 +1,4 @@
 PLUGIN = ap-dummy$(PLUGIN_SUFFIX)
-plugindir = audacious/$(AMIDIPLUG_BACKEND_DIR)
-
 noinst_HEADERS = b-dummy.h b-dummy-config.h backend-dummy-icon.xpm
 
 SRCS = b-dummy.c
@@ -8,6 +6,8 @@
 include ../../../buildsys.mk
 include ../../../extra.mk
 
+plugindir := $(plugindir)/$(AMIDIPLUG_BACKEND_DIR)
+
 CFLAGS += $(PLUGIN_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GLIB_CFLAGS) -I../../..
 LIBS += ../pcfg/libpcfg.a
diff -r e2904348f154 -r a56a26a5f233 src/amidi-plug/backend-fluidsynth/Makefile
--- a/src/amidi-plug/backend-fluidsynth/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/amidi-plug/backend-fluidsynth/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,6 +1,4 @@
 PLUGIN = ap-fluidsynth$(PLUGIN_SUFFIX)
-plugindir = audacious/$(AMIDIPLUG_BACKEND_DIR)
-
 noinst_HEADERS = b-fluidsynth.h b-fluidsynth-config.h backend-fluidsynth-icon.xpm
 
 SRCS = b-fluidsynth.c
@@ -8,6 +6,8 @@
 include ../../../buildsys.mk
 include ../../../extra.mk
 
+plugindir := $(plugindir)/$(AMIDIPLUG_BACKEND_DIR)
+
 CFLAGS += $(PLUGIN_CFLAGS) $(FLUIDSYNTH_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(FLUIDSYNTH_CFLAGS) $(GLIB_CFLAGS) -I../../..
 LIBS += $(FLUIDSYNTH_LIBS) ../pcfg/libpcfg.a
diff -r e2904348f154 -r a56a26a5f233 src/aosd/Makefile
--- a/src/aosd/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/aosd/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -8,11 +8,11 @@
        ghosd.c		\
        ghosd-main.c
 
-plugindir = audacious/${GENERAL_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+
 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..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CAIRO_LIBS} ${PANGOCAIRO_LIBS} ${XRENDER_LIBS} ${XCOMPOSITE_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/arts/Makefile
--- a/src/arts/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/arts/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -6,11 +6,11 @@
        audio.c		\
        convert.c
 
-plugindir = audacious/${OUTPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARTSC_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${ARTSC_LIBS} -lpthread
diff -r e2904348f154 -r a56a26a5f233 src/audiocompress/Makefile
--- a/src/audiocompress/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/audiocompress/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -2,11 +2,11 @@
 SRCS = compress.c	\
        audacious-glue.c
 
-plugindir = audacious/${EFFECT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/blur_scope/Makefile
--- a/src/blur_scope/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/blur_scope/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -7,6 +7,8 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/cdaudio-ng/Makefile
--- a/src/cdaudio-ng/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/cdaudio-ng/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -2,11 +2,11 @@
 SRCS = cdaudio-ng.c	\
        configure.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${CDIO_CFLAGS} ${CDDB_CFLAGS} -I../.. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES}
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CDIO_LIBS} ${CDDB_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/console/Makefile
--- a/src/console/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/console/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -50,11 +50,11 @@
        Ym2612_Emu.cxx          \
        Zlib_Inflater.cxx
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 LD = ${CXX}
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
diff -r e2904348f154 -r a56a26a5f233 src/cue/Makefile
--- a/src/cue/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/cue/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = cuesheet${PLUGIN_SUFFIX}
 SRCS = cuesheet.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${DBUS_LIB}
diff -r e2904348f154 -r a56a26a5f233 src/curl/Makefile
--- a/src/curl/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/curl/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = curl${PLUGIN_SUFFIX}
 SRCS = curl.c
 
-plugindir = audacious/${TRANSPORT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${CURL_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${CURL_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/dockalbumart/Makefile
--- a/src/dockalbumart/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/dockalbumart/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = dockalbumart${PLUGIN_SUFFIX}
 SRCS = dockalbumart.c
 
-plugindir = audacious/${GENERAL_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/echo_plugin/Makefile
--- a/src/echo_plugin/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/echo_plugin/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -2,11 +2,11 @@
 SRCS = echo.c	\
        gui.c
 
-plugindir = audacious/${EFFECT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/esd/Makefile
--- a/src/esd/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/esd/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -6,11 +6,11 @@
        audio.c		\
        init.c
 
-plugindir = audacious/${OUTPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ESD_CFLAGS} -I../../intl -I../.. -I..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${ESD_LIBS} ${OSS_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/evdev-plug/Makefile
--- a/src/evdev-plug/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/evdev-plug/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -4,11 +4,11 @@
        ed_internals.c		\
        ed_ui.c
 
-plugindir = audacious/${GENERAL_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/filewriter/Makefile
--- a/src/filewriter/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/filewriter/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -5,11 +5,11 @@
        vorbis.c		\
        flac.c
 
-plugindir = audacious/${OUTPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GLIB_CFLAGS} ${GTK_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${FILEWRITER_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/flacng/Makefile
--- a/src/flacng/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/flacng/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -4,11 +4,11 @@
        seekable_stream_callbacks.c	\
        flac_compat112.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. ${LIBFLAC_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${LIBFLAC_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/gnomeshortcuts/Makefile
--- a/src/gnomeshortcuts/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/gnomeshortcuts/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = gnomeshortcuts${PLUGIN_SUFFIX}
 SRCS = gnomeshortcuts.c
 
-plugindir = audacious/${GENERAL_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. -I..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GLIB_LIBS} ${DBUS_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/hotkey/Makefile
--- a/src/hotkey/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/hotkey/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,12 @@
 PLUGIN = hotkey${PLUGIN_SUFFIX}
-plugindir = audacious/${GENERAL_PLUGIN_DIR}
 
 SRCS = plugin.c
 
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${MOWGLI_CFLAGS} ${GLIB_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. -I..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GLIB_LIBS} ${DBUS_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/jack/Makefile
--- a/src/jack/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/jack/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -3,11 +3,11 @@
        configure.c	\
        bio2jack.c
 
-plugindir = audacious/${OUTPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${SAMPLERATE_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${JACK_LIBS} ${SAMPLERATE_LIBS} -pthread
diff -r e2904348f154 -r a56a26a5f233 src/ladspa/Makefile
--- a/src/ladspa/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/ladspa/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = ladspa${PLUGIN_SUFFIX}
 SRCS = ladspa.c
 
-plugindir = audacious/${EFFECT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/lastfm/Makefile
--- a/src/lastfm/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/lastfm/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,12 @@
 PLUGIN = lastfm${PLUGIN_SUFFIX}
-plugindir = audacious/${TRANSPORT_PLUGIN_DIR}
 
 SRCS = lastfm.c
 
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${CURL_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${CURL_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/lirc/Makefile
--- a/src/lirc/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/lirc/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,12 @@
 PLUGIN = lirc$(PLUGIN_SUFFIX)
 
-plugindir = audacious/$(GENERAL_PLUGIN_DIR)
 SRCS = about.c lirc.c
 
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/$(GENERAL_PLUGIN_DIR)
+
 LIBS += -llirc_client $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
 CFLAGS += $(PLUGIN_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(GTK_CFLAGS) $(MOWGLI_CFLAGS) $(PANGO_CFLAGS) $(DBUS_CFLAGS) -I../../intl -I../..
diff -r e2904348f154 -r a56a26a5f233 src/m3u/Makefile
--- a/src/m3u/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/m3u/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,12 @@
 PLUGIN = m3u${PLUGIN_SUFFIX}
+
 SRCS = m3u.c
 
-plugindir = audacious/${CONTAINER_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${CONTAINER_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../.. -Wall
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/madplug/Makefile
--- a/src/madplug/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/madplug/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -8,11 +8,11 @@
        plugin.c		\
        xing.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${MOWGLI_CFLAGS} ${ARCH_DEFINES} ${SIMD_CFLAGS} -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += -L${libdir} -laudid3tag -lmad ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/metronom/Makefile
--- a/src/metronom/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/metronom/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,12 @@
 PLUGIN = metronom${PLUGIN_SUFFIX}
+
 SRCS = metronom.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/mms/Makefile
--- a/src/mms/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/mms/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,12 @@
 PLUGIN = mms${PLUGIN_SUFFIX}
+
 SRCS = mms.c
 
-plugindir = audacious/${TRANSPORT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+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}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${MMS_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/modplug/Makefile
--- a/src/modplug/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/modplug/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -45,11 +45,11 @@
        gui/interface.cxx	\
        gui/callbacks.cxx
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I.. -I../.. -I../../intl
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
diff -r e2904348f154 -r a56a26a5f233 src/mtp_up/Makefile
--- a/src/mtp_up/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/mtp_up/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = mtp_up${PLUGIN_SUFFIX}
 SRCS = mtp.c filetype.c
 
-plugindir = audacious/${GENERAL_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. ${MTP_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${MTP_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/musepack/Makefile
--- a/src/musepack/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/musepack/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = musepack${PLUGIN_SUFFIX}
 SRCS = libmpc.cxx
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${TAGLIB_CFLAGS} -I../../intl -I../..
 CXXFLAGS += ${PLUGIN_CFLAGS}
 LIBS += -lmpcdec ${TAGLIB_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/neon/Makefile
--- a/src/neon/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/neon/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -2,11 +2,11 @@
 SRCS = neon.c	\
        rb.c
 
-plugindir = audacious/${TRANSPORT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${NEON_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${NEON_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/null/Makefile
--- a/src/null/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/null/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = null${PLUGIN_SUFFIX}
 SRCS = null.c
 
-plugindir = audacious/${OUTPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${DBUS_CFLAGS} ${MOWGLI_CFLAGS} -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/paranormal/Makefile
--- a/src/paranormal/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/paranormal/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -22,11 +22,11 @@
        libcalc/parser.c		\
        libcalc/storage.c
 
-plugindir = audacious/${VISUALIZATION_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} -I../../intl -I../.. -I.
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} ${SDL_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/pls/Makefile
--- a/src/pls/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/pls/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = pls${PLUGIN_SUFFIX}
 SRCS = pls.c
 
-plugindir = audacious/${CONTAINER_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${CONTAINER_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/projectm-1.0/Makefile
--- a/src/projectm-1.0/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/projectm-1.0/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -4,11 +4,11 @@
        ConfigFile.cxx   \
        main_visplugin.c
 
-plugindir = audacious/${VISUALIZATION_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} ${LIBPROJECTM1_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
diff -r e2904348f154 -r a56a26a5f233 src/projectm/Makefile
--- a/src/projectm/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/projectm/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -2,11 +2,11 @@
 SRCS = main.c		\
        video_init.c
 
-plugindir = audacious/${VISUALIZATION_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} ${SDL_CFLAGS} ${LIBPROJECTM_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${SDL_LIBS} ${LIBPROJECTM_LIBS} -lprojectM
diff -r e2904348f154 -r a56a26a5f233 src/pulse_audio/Makefile
--- a/src/pulse_audio/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/pulse_audio/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = pulse_audio${PLUGIN_SUFFIX}
 SRCS = pulse_audio.c
 
-plugindir = audacious/${OUTPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${OUTPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += -lpulse ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/rocklight/Makefile
--- a/src/rocklight/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/rocklight/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -3,11 +3,11 @@
        sysled.c		\
        thinklight.c
 
-plugindir = audacious/${VISUALIZATION_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/rootvis/Makefile
--- a/src/rootvis/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/rootvis/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -6,11 +6,11 @@
        getroot.c			\
        rootvis.c
 
-plugindir = audacious/${VISUALIZATION_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} -I. ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${IMLIB2_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${IMLIB2_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/scrobbler/Makefile
--- a/src/scrobbler/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/scrobbler/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -10,13 +10,13 @@
 DATA = images/audioscrobbler.png	\
        images/audioscrobbler_badge.png
 
-plugindir = audacious/${GENERAL_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
 PACKAGE = audacious
 
+plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${BEEP_DEFINES} ${CURL_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${CURL_LIBS} ${MUSICBRAINZ_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/sexypsf/Makefile
--- a/src/sexypsf/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/sexypsf/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -12,11 +12,11 @@
        spu/spu.c	\
        plugin.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../.. -Ispu/ -I.
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += -lz ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/sid/Makefile
--- a/src/sid/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/sid/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -17,11 +17,11 @@
        xs_slsup.c	\
        xmms-sid.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} -D_REENTRANT -I../../intl -I../.. -DAUDACIOUS_PLUGIN ${MOWGLI_CFLAGS} ${SIDPLAY1_INCLUDES} ${SIDPLAY2_INCLUDES} ${BUILDERS_INCLUDES} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS}
 CFLAGS += ${PLUGIN_CFLAGS}
 CXXFLAGS += ${PLUGIN_CFLAGS}
diff -r e2904348f154 -r a56a26a5f233 src/smb/Makefile
--- a/src/smb/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/smb/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = smb${PLUGIN_SUFFIX}
 SRCS = smb.c
 
-plugindir = audacious/${TRANSPORT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS} -lsmbclient
diff -r e2904348f154 -r a56a26a5f233 src/sndstretch/Makefile
--- a/src/sndstretch/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/sndstretch/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,10 +1,10 @@
 PLUGIN = sndstretch${PLUGIN_SUFFIX}
 SRCS = sndstretch_xmms.c sndstretch.c
 
-plugindir = audacious/${EFFECT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${MOWGLI_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
diff -r e2904348f154 -r a56a26a5f233 src/song_change/Makefile
--- a/src/song_change/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/song_change/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = song_change${PLUGIN_SUFFIX}
 SRCS = song_change.c
 
-plugindir = audacious/${GENERAL_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/spectrum/Makefile
--- a/src/spectrum/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/spectrum/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = spectrum${PLUGIN_SUFFIX}
 SRCS = spectrum.c
 
-plugindir = audacious/${VISUALIZATION_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${VISUALIZATION_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/statusicon/Makefile
--- a/src/statusicon/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/statusicon/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -4,11 +4,11 @@
        si_cfg.c			\
        si_ui.c
 
-plugindir = audacious/${GENERAL_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${GENERAL_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${BEEP_DEFINES} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/stdio/Makefile
--- a/src/stdio/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/stdio/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = stdio${PLUGIN_SUFFIX}
 SRCS = stdio.c
 
-plugindir = audacious/${TRANSPORT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${TRANSPORT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/stereo_plugin/Makefile
--- a/src/stereo_plugin/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/stereo_plugin/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = stereo${PLUGIN_SUFFIX}
 SRCS = stereo.c
 
-plugindir = audacious/${EFFECT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/sun/Makefile
--- a/src/sun/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/sun/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,3 +1,4 @@
+PLUGIN = sun$(PLUGIN_SUFFIX)
 SRCS =	sun.c	    \
 	audio.c	    \
 	convert.c   \
@@ -5,13 +6,11 @@
 	configure.c \
 	about.c
 
-PLUGIN = sun$(PLUGIN_SUFFIX)
-plugindir = audacious/$(OUTPUT_PLUGIN_DIR)
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/$(OUTPUT_PLUGIN_DIR)
+
 CFLAGS += $(PLUGIN_CFLAGS)
 CPPFLAGS += $(PLUGIN_CPPFLAGS) $(MOWGLI_CFLAGS) $(DBUS_CFLAGS) $(GTK_CFLAGS) $(GLIB_CFLAGS) $(PANGO_CFLAGS) -I../../intl -I../..
 LIBS += $(GTK_LIBS) $(GLIB_LIBS) $(PANGO_LIBS)
-
diff -r e2904348f154 -r a56a26a5f233 src/timidity/Makefile
--- a/src/timidity/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/timidity/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -14,11 +14,11 @@
        libtimidity/tables.c		\
        libtimidity/timidity.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../.. -I./libtimidity
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/tonegen/Makefile
--- a/src/tonegen/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/tonegen/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,10 @@
 PLUGIN = tonegen${PLUGIN_SUFFIX}
 SRCS = tonegen.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../..
 
diff -r e2904348f154 -r a56a26a5f233 src/tta/Makefile
--- a/src/tta/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/tta/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -2,11 +2,11 @@
 SRCS = libtta.c	\
        ttadec.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += -L${libdir} -laudid3tag ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/voice_removal/Makefile
--- a/src/voice_removal/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/voice_removal/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = voice_removal${PLUGIN_SUFFIX}
 SRCS = voice_removal.c
 
-plugindir = audacious/${EFFECT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${EFFECT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/vorbis/Makefile
--- a/src/vorbis/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/vorbis/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -4,11 +4,11 @@
        vcedit.c		\
        vorbis.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${OGG_VORBIS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${OGG_VORBIS_LIBS} ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/vtx/Makefile
--- a/src/vtx/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/vtx/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -7,11 +7,11 @@
        vtx.c		\
        vtxfile.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} -I../../intl -I../.. -I.
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/wav/Makefile
--- a/src/wav/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/wav/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -3,9 +3,9 @@
 PLUGIN = wav${PLUGIN_SUFFIX}
 SRCS = wav${WAV_SNDFILE}.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
+include ../../buildsys.mk
 
-include ../../buildsys.mk
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
 
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${DBUS_CFLAGS} -I../../intl -I../.. 
 CFLAGS += ${PLUGIN_CFLAGS}
diff -r e2904348f154 -r a56a26a5f233 src/wavpack/Makefile
--- a/src/wavpack/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/wavpack/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -3,11 +3,11 @@
        ui.cxx		\
        libwavpack.cxx
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+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}
 LDFLAGS += -lstdc++
diff -r e2904348f154 -r a56a26a5f233 src/wma/Makefile
--- a/src/wma/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/wma/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -20,11 +20,11 @@
        libffwma/mem.c		\
        libffwma/uri.c
 
-plugindir = audacious/${INPUT_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${INPUT_PLUGIN_DIR}
+
 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
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS}
diff -r e2904348f154 -r a56a26a5f233 src/xspf/Makefile
--- a/src/xspf/Makefile	Tue Oct 09 22:39:32 2007 +0300
+++ b/src/xspf/Makefile	Wed Oct 10 01:40:13 2007 +0300
@@ -1,11 +1,11 @@
 PLUGIN = xspf${PLUGIN_SUFFIX}
 SRCS = xspf.c
 
-plugindir = audacious/${CONTAINER_PLUGIN_DIR}
-
 include ../../buildsys.mk
 include ../../extra.mk
 
+plugindir := $(plugindir)/${CONTAINER_PLUGIN_DIR}
+
 CPPFLAGS += ${PLUGIN_CPPFLAGS} ${MOWGLI_CFLAGS} ${DBUS_CFLAGS} ${GTK_CFLAGS} ${GLIB_CFLAGS} ${PANGO_CFLAGS} ${ARCH_DEFINES} ${XML_CPPFLAGS} -I../../intl -I../..
 CFLAGS += ${PLUGIN_CFLAGS}
 LIBS += ${GTK_LIBS} ${GLIB_LIBS} ${PANGO_LIBS} ${XML_LIBS}