# HG changeset patch # User Matti Hamalainen # Date 1190213250 -10800 # Node ID 4f99a9e270cf3156209f10f258a7b63b768417ae # Parent d3ba8bcf9fd621393b9581e58afb03eae714a092# Parent cfb56cc47f9fad99ea82013319869fb489766aa9 Automated merge with ssh://hg.atheme.org//hg/audacious diff -r d3ba8bcf9fd6 -r 4f99a9e270cf buildsys.mk.in --- a/buildsys.mk.in Wed Sep 19 17:47:18 2007 +0300 +++ b/buildsys.mk.in Wed Sep 19 17:47:30 2007 +0300 @@ -70,6 +70,10 @@ 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 @@ -100,7 +104,7 @@ ${PROG} ${PROG_NOINST}: ${EXT_DEPS} ${OBJS} ${LINK_STATUS} - if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS}; then \ + if ${LD} -o $@ ${OBJS} ${LDFLAGS} ${LIBS} ${RPATH}; then \ ${LINK_OK}; \ else \ ${LINK_FAILED}; \