--- libtool.old	Sun May 31 21:33:37 2009
+++ libtool	Sun May 31 21:38:39 2009
@@ -196,7 +196,7 @@
 version_type=linux
 
 # Shared library runtime path variable.
-runpath_var=LD_RUN_PATH
+runpath_var=DIE_RPATH_DIE
 
 # Shared library path variable.
 shlibpath_var=LD_LIBRARY_PATH
@@ -321,7 +321,7 @@
 
 # Flag to hardcode $libdir into a binary during linking.
 # This must work even if $libdir does not exist
-hardcode_libdir_flag_spec="\${wl}-rpath \${wl}\$libdir"
+hardcode_libdir_flag_spec=""
 
 # If ld is used when linking, flag to hardcode $libdir into a binary
 # during linking.  This must work even if $libdir does not exist.