--- elfutils-0.114/src/Makefile.am.orig	2005-08-15 22:09:07 +0000

+++ elfutils-0.114/src/Makefile.am	2005-09-03 23:12:14 +0000

@@ -92,7 +92,7 @@ endif

 ld_LDFLAGS = -rdynamic

 elflint_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl

 findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)

-addr2line_LDADD = $(libdw) $(libmudflap)

+addr2line_LDADD = $(libdw) $(libmudflap) -Wl,-rpath-link,../libelf

 elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl

 objdump_LDADD  = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl

 ranlib_LDADD = $(libelf) $(libeu) $(libmudflap)

--- elfutils-0.114/src/Makefile.in.orig	2005-08-15 22:09:10 +0000

+++ elfutils-0.114/src/Makefile.in	2005-09-03 23:14:33 +0000

@@ -304,7 +304,7 @@ ld_LDADD = $(libebl) $(libelf) $(libeu) 

 ld_LDFLAGS = -rdynamic

 elflint_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl

 findtextrel_LDADD = $(libdw) $(libelf) $(libmudflap)

-addr2line_LDADD = $(libdw) $(libmudflap)

+addr2line_LDADD = $(libdw) $(libmudflap) -Wl,-rpath-link,../libelf

 elfcmp_LDADD = $(libebl) $(libelf) $(libmudflap) -ldl

 objdump_LDADD = $(libebl) $(libelf) $(libeu) $(libmudflap) -ldl

 ranlib_LDADD = $(libelf) $(libeu) $(libmudflap)

--- elfutils-0.114/tests/Makefile.am.orig	2005-08-25 00:54:05 +0400

+++ elfutils-0.114/tests/Makefile.am	2005-09-04 03:30:01 +0400

@@ -20,7 +20,7 @@ AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../lib

 else

 AM_CFLAGS = -Wall -Wextra -std=gnu99 \

 	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)

-AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf

+AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf,-rpath-link,../libelf

 endif

 INCLUDES = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \

 	   -I$(top_srcdir)/libdwfl \

--- elfutils-0.114/tests/Makefile.in.orig	2005-08-25 00:54:11 +0400

+++ elfutils-0.114/tests/Makefile.in	2005-09-04 03:30:47 +0400

@@ -325,7 +325,7 @@ target_alias = @target_alias@

 @MUDFLAP_TRUE@AM_CFLAGS = -Wall -Wextra -std=gnu99 -fmudflap\

 @MUDFLAP_TRUE@	    $(if $($(*F)_no_Wformat),-Wno-format,-Wformat=2)

-@MUDFLAP_FALSE@AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf

+@MUDFLAP_FALSE@AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libasm:\$$ORIGIN/../libdw:\$$ORIGIN/../libebl:\$$ORIGIN/../libelf,-rpath-link,../libelf

 @MUDFLAP_TRUE@AM_LDFLAGS = -Wl,-rpath,\$$ORIGIN/../libebl

 INCLUDES = -I$(top_srcdir)/libasm -I$(top_srcdir)/libdw \

 	   -I$(top_srcdir)/libdwfl \