# HG changeset patch
# User Yoshiki Yazawa <yaz@honeyplanet.jp>
# Date 1227639000 -32400
# Node ID 9bc0c8a3a0f030ab7f7b92e74a880c84bc06093d
# Parent  a7b80f765d6f329bf50438808d73ceeab279f451
moved private libraries to plugindir to avoid conflict with audacious.

diff -r a7b80f765d6f -r 9bc0c8a3a0f0 buildsys.mk.in
--- a/buildsys.mk.in	Wed Nov 26 02:56:18 2008 +0900
+++ b/buildsys.mk.in	Wed Nov 26 03:50:00 2008 +0900
@@ -248,7 +248,7 @@
 
 	for i in ${LIB}; do \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL_LIB}; then \
+		if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL_LIB}; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
@@ -257,7 +257,7 @@
 
 	for i in ${STATIC_LIB}; do \
 		${INSTALL_STATUS}; \
-		if ${MKDIR_P} ${DESTDIR}${libdir} && ${INSTALL} -m 644 $$i ${DESTDIR}${libdir}/$$i; then \
+		if ${MKDIR_P} ${DESTDIR}${plugindir} && ${INSTALL} -m 644 $$i ${DESTDIR}${plugindir}/$$i; then \
 			${INSTALL_OK}; \
 		else \
 			${INSTALL_FAILED}; \
@@ -319,7 +319,7 @@
 	done
 
 	for i in ${LIB}; do \
-		if test -f ${DESTDIR}${libdir}/$$i; then \
+		if test -f ${DESTDIR}${plugindir}/$$i; then \
 			if ${UNINSTALL_LIB}; then \
 				${DELETE_OK}; \
 			else \
@@ -329,8 +329,8 @@
 	done
 
 	for i in ${STATIC_LIB}; do \
-		if test -f ${DESTDIR}${libdir}/$$i; then \
-			if rm -f ${DESTDIR}${libdir}/$$i; then \
+		if test -f ${DESTDIR}${plugindir}/$$i; then \
+			if rm -f ${DESTDIR}${plugindir}/$$i; then \
 				${DELETE_OK}; \
 			else \
 				${DELETE_FAILED}; \
diff -r a7b80f765d6f -r 9bc0c8a3a0f0 configure.ac
--- a/configure.ac	Wed Nov 26 02:56:18 2008 +0900
+++ b/configure.ac	Wed Nov 26 03:50:00 2008 +0900
@@ -32,9 +32,6 @@
 IMPLIB_LIBS=""
 AC_SUBST([IMPLIB_LIBS])
 
-AUDLDFLAGS="-Wl,-rpath,${libdir}"
-AC_SUBST([AUDLDFLAGS])
-
 dnl Plugin stuff
 dnl ========================
 SHARED_SUFFIX="$PLUGIN_SUFFIX"
@@ -297,6 +294,11 @@
 AUD_DEFINE_PLUGIN_DIR([Transport])
 AUD_DEFINE_PLUGIN_DIR([Discovery])
 
+### ---------------------------------------------------------------------------
+dnl Setup rpath
+dnl ===========
+AUDLDFLAGS="-Wl,-rpath,${plugindir}"
+AC_SUBST([AUDLDFLAGS])
 
 ### ---------------------------------------------------------------------------
 dnl XXX Work around some autoconf bugs.
diff -r a7b80f765d6f -r 9bc0c8a3a0f0 m4/buildsys.m4
--- a/m4/buildsys.m4	Wed Nov 26 02:56:18 2008 +0900
+++ b/m4/buildsys.m4	Wed Nov 26 03:50:00 2008 +0900
@@ -53,23 +53,23 @@
 			PLUGIN_CFLAGS=''
 			PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress'
 			PLUGIN_SUFFIX='.impl'
-			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${plugindir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${plugindir}/$$i'
+			UNINSTALL_LIB='rm -f ${DESTDIR}${plugindir}/$$i ${DESTDIR}${plugindir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${plugindir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
 			CLEAN_LIB=''
 			;;
 		*-apple-*)
 			AC_MSG_RESULT(Mac OS X)
 			LIB_CPPFLAGS='-DPIC'
 			LIB_CFLAGS=''
-			LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${libdir}/${LIB} -flat_namespace -undefined suppress'
+			LIB_LDFLAGS='-dynamiclib -fPIC -install_name ${plugindir}/${LIB} -flat_namespace -undefined suppress'
 			LIB_PREFIX='lib'
 			LIB_SUFFIX='.dylib'
 			PLUGIN_CPPFLAGS=''
 			PLUGIN_CFLAGS=''
 			PLUGIN_LDFLAGS='-bundle -fno-common -flat_namespace -undefined suppress'
 			PLUGIN_SUFFIX='.impl'
-			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${libdir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${plugindir}/$${i%.dylib}.${LIB_MAJOR}.dylib && ${LN_S} -f $${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib ${DESTDIR}${plugindir}/$$i'
+			UNINSTALL_LIB='rm -f ${DESTDIR}${plugindir}/$$i ${DESTDIR}${plugindir}/$${i%.dylib}.${LIB_MAJOR}.dylib ${DESTDIR}${plugindir}/$${i%.dylib}.${LIB_MAJOR}.${LIB_MINOR}.dylib'
 			CLEAN_LIB=''
 			;;
 		*-*-solaris* | *-openbsd-* | *-mirbsd-*)
@@ -83,8 +83,8 @@
 			PLUGIN_CFLAGS='-fPIC'
 			PLUGIN_LDFLAGS='-shared -fPIC'
 			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${libdir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i.${LIB_MAJOR}.${LIB_MINOR} && rm -f ${DESTDIR}${plugindir}/$$i && ${LN_S} $$i.${LIB_MAJOR}.${LIB_MINOR} ${DESTDIR}${plugindir}/$$i'
+			UNINSTALL_LIB='rm -f ${DESTDIR}${plugindir}/$$i ${DESTDIR}${plugindir}/$$i.${LIB_MAJOR}.${LIB_MINOR}'
 			CLEAN_LIB=''
 			;;
 		*-*-cygwin | *-*-mingw32)
@@ -98,8 +98,8 @@
 			PLUGIN_CFLAGS=''
 			PLUGIN_LDFLAGS='-shared'
 			PLUGIN_SUFFIX='.dll'
-			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${libdir}/$$i.a'
-			UNINSTALL_LIB='rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${libdir}/$$i.a'
+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${bindir}/$$i && ${INSTALL} -m 755 $$i.a ${DESTDIR}${plugindir}/$$i.a'
+			UNINSTALL_LIB='rm -f ${DESTDIR}${bindir}/$$i ${DESTDIR}${plugindir}/$$i.a'
 			CLEAN_LIB='${LIB}.a'
 			;;
 		*)
@@ -113,8 +113,8 @@
 			PLUGIN_CFLAGS='-fPIC'
 			PLUGIN_LDFLAGS='-shared -fPIC'
 			PLUGIN_SUFFIX='.so'
-			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${libdir}/$$i'
-			UNINSTALL_LIB='rm -f ${DESTDIR}${libdir}/$$i ${DESTDIR}${libdir}/$$i.${LIB_MAJOR} ${DESTDIR}${libdir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
+			INSTALL_LIB='${INSTALL} -m 755 $$i ${DESTDIR}${plugindir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0 && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${plugindir}/$$i.${LIB_MAJOR} && ${LN_S} -f $$i.${LIB_MAJOR}.${LIB_MINOR}.0 ${DESTDIR}${plugindir}/$$i'
+			UNINSTALL_LIB='rm -f ${DESTDIR}${plugindir}/$$i ${DESTDIR}${plugindir}/$$i.${LIB_MAJOR} ${DESTDIR}${plugindir}/$$i.${LIB_MAJOR}.${LIB_MINOR}.0'
 			CLEAN_LIB=''
 			;;
 	esac
diff -r a7b80f765d6f -r 9bc0c8a3a0f0 src/libSAD/Makefile
--- a/src/libSAD/Makefile	Wed Nov 26 02:56:18 2008 +0900
+++ b/src/libSAD/Makefile	Wed Nov 26 03:50:00 2008 +0900
@@ -12,8 +12,8 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-PACKAGE = libSAD
-includesubdir = audlegacy
+#PACKAGE = libSAD
+#includesubdir = audlegacy
 
 CPPFLAGS += ${SIMD_CFLAGS} -I../..
 CFLAGS += ${LIB_CFLAGS}
\ No newline at end of file