# HG changeset patch
# User mf0102 <0102@gmx.at>
# Date 1190381716 -7200
# Node ID fb74bdfd75b8b8c15e67be7c415b016d1039d162
# Parent  9197ea39a08acc69565993dbb1a346652b30f903# Parent  f104e23b87dae10f2b2563793ee22df1eaa7e560
merge

diff -r 9197ea39a08a -r fb74bdfd75b8 buildsys.mk.in
--- a/buildsys.mk.in	Fri Sep 21 15:22:31 2007 +0200
+++ b/buildsys.mk.in	Fri Sep 21 15:35:16 2007 +0200
@@ -61,7 +61,6 @@
 includesubdir ?= ${PACKAGE}
 mandir = @mandir@
 mansubdir ?= man1
-pkgdatadir = ${datadir}/${PACKAGE}
 
 OBJS1 = ${SRCS:.c=.o}
 OBJS2 = ${OBJS1:.cc=.o}
@@ -70,10 +69,6 @@
 OBJS5 = ${OBJS4:.erl=.beam}
 OBJS += ${OBJS5:.m=.o}
 
-ifneq ($(strip $(prefix)),)
-	RPATH = -Wl,-rpath=${libdir}
-endif
-
 .SILENT:
 .SUFFIXES: .beam .c .cc .cxx .d .erl .m
 .PHONY: all subdirs depend install uninstall clean distclean
@@ -87,9 +82,7 @@
 		${DIR_LEAVE}; \
 	done
 
-depend-hook:
-
-depend: depend-hook
+depend: pre-depend
 	regen=0; \
 	for i in ${SRCS}; do [ $$i -nt .deps ] && regen=1; done; \
 	if [ $$regen = 1 ]; then \
@@ -102,9 +95,11 @@
 		done; \
 	fi
 
+pre-depend:
+
 ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS}
 	${LINK_STATUS}
-	if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS} ${RPATH}; then \
+	if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \
 		${LINK_OK}; \
 	else \
 		${LINK_FAILED}; \
diff -r 9197ea39a08a -r fb74bdfd75b8 extra.mk.in
--- a/extra.mk.in	Fri Sep 21 15:22:31 2007 +0200
+++ b/extra.mk.in	Fri Sep 21 15:35:16 2007 +0200
@@ -3,7 +3,6 @@
 srcdir ?= @srcdir@
 top_srcdir ?= @top_srcdir@
 VPATH ?= @srcdir@
-pkgdatadir ?= $(datadir)/@PACKAGE@
 pkglibdir ?= $(libdir)/@PACKAGE@
 pkgincludedir ?= $(includedir)/@PACKAGE@
 top_builddir ?= .
diff -r 9197ea39a08a -r fb74bdfd75b8 m4/sharedlib.m4
--- a/m4/sharedlib.m4	Fri Sep 21 15:22:31 2007 +0200
+++ b/m4/sharedlib.m4	Fri Sep 21 15:35:16 2007 +0200
@@ -53,7 +53,7 @@
 			AC_MSG_RESULT(Solaris)
 			LIB_CPPFLAGS='-DPIC'
 			LIB_CFLAGS='-fPIC'
-			LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}'
+			LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR} -Wl,-R ${libdir}'
 			LIB_PREFIX='lib'
 			LIB_SUFFIX='.so'
 			PLUGIN_CPPFLAGS='-DPIC'
@@ -81,7 +81,7 @@
 			AC_MSG_RESULT(POSIX)
 			LIB_CPPFLAGS='-DPIC'
 			LIB_CFLAGS='-fPIC'
-			LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}.0'
+			LIB_LDFLAGS='-shared -fPIC -Wl,-soname=${LIB}.${LIB_MAJOR}.${LIB_MINOR}.0 -Wl,-R ${libdir}'
 			LIB_PREFIX='lib'
 			LIB_SUFFIX='.so'
 			PLUGIN_CPPFLAGS='-DPIC'
diff -r 9197ea39a08a -r fb74bdfd75b8 src/audacious/Makefile
--- a/src/audacious/Makefile	Fri Sep 21 15:22:31 2007 +0200
+++ b/src/audacious/Makefile	Fri Sep 21 15:35:16 2007 +0200
@@ -166,7 +166,7 @@
 LIBS += -L../libaudclient -laudclient
 endif
 
-depend-hook: ${DBUS_BINDINGS}
+pre-depend: ${DBUS_BINDINGS}
 
 CPPFLAGS += -DHAVE_CONFIG_H		\
 	    ${MOWGLI_CFLAGS}		\
diff -r 9197ea39a08a -r fb74bdfd75b8 src/libaudclient/Makefile
--- a/src/libaudclient/Makefile	Fri Sep 21 15:22:31 2007 +0200
+++ b/src/libaudclient/Makefile	Fri Sep 21 15:35:16 2007 +0200
@@ -9,8 +9,8 @@
 include ../../buildsys.mk
 include ../../extra.mk
 
-depend-hook:
-	cd ../audacious; make dbus-client-bindings.h
+pre-depend:
+	cd ../audacious; ${MAKE} ${MFLAGS} dbus-client-bindings.h
 
 CPPFLAGS = ${LIB_CPPFLAGS} ${CFLAGS} -D_AUDACIOUS_CORE -I.. -I../.. -I../intl
 CFLAGS += ${LIB_CFLAGS}		\