diff -Naur libtool/libtool.m4 libtool.mod/libtool.m4
--- libtool/libtool.m4	Sat Mar  9 12:53:33 2002
+++ libtool.mod/libtool.m4	Sat Mar  9 12:53:19 2002
@@ -2586,7 +2586,7 @@
     #        cross-compilation, but unfortunately the echo tests do not
     #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
     #	       `"' quotes if we put them in here... so don't!
-    _LT_AC_TAGVAR(archive_cmds, $1)='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+    _LT_AC_TAGVAR(archive_cmds, $1)='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $install_libdir/$soname $verstring'
     # We need to add '_' to the symbols in $export_symbols first
     #_LT_AC_TAGVAR(archive_expsym_cmds, $1)="$_LT_AC_TAGVAR(archive_cmds, $1)"' && strip -s $export_symbols'
     _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -4812,7 +4812,7 @@
       #        cross-compilation, but unfortunately the echo tests do not
       #        yet detect zsh echo's removal of \ escapes.  Also zsh mangles
       #	       `"' quotes if we put them in here... so don't!
-      _LT_AC_TAGVAR(archive_cmds, $1)='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $rpath/$soname $verstring'
+      _LT_AC_TAGVAR(archive_cmds, $1)='$CC $(test .$module = .yes && echo -bundle || echo -dynamiclib) $allow_undefined_flag -o $lib $libobjs $deplibs$linker_flags -install_name $install_libdir/$soname $verstring'
       # We need to add '_' to the symbols in $export_symbols first
       #_LT_AC_TAGVAR(archive_expsym_cmds, $1)="$_LT_AC_TAGVAR(archive_cmds, $1)"' && strip -s $export_symbols'
       _LT_AC_TAGVAR(hardcode_direct, $1)=yes
diff -Naur libtool/ltmain.in libtool.mod/ltmain.in
--- libtool/ltmain.in	Sat Mar  9 12:53:33 2002
+++ libtool.mod/ltmain.in	Sat Mar  9 12:55:24 2002
@@ -1080,6 +1080,9 @@
 	  # We need an absolute path.
 	  case $arg in
 	  [\\/]* | [A-Za-z]:[\\/]*) ;;
+	  @executable_path | @executable_path[\\/]*)
+	    $echo "$modename: warning: @executable_path support is experimental" 1>&2
+	    ;;
 	  *)
 	    $echo "$modename: only absolute run-paths are allowed" 1>&2
 	    exit 1
@@ -2587,7 +2590,8 @@
 
       set dummy $rpath
       if test "$#" -gt 2; then
-	$echo "$modename: warning: ignoring multiple \`-rpath's for a libtool library" 1>&2
+	$echo "$modename: warning: multiple \`-rpath's - using last-specified" 1>&2
+	while test "$#" -gt 2; do shift; done
       fi
       install_libdir="$2"
 
@@ -4463,6 +4467,7 @@
 	  case $host,$output,$installed,$module,$dlname in
 	    *cygwin*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
 	  esac
+          dependency_libs_noepath=`$echo "X$dependency_libs" | $Xsed -e 'address@hidden/lib\([^/]*\)\.la#-l\1#g'`
 	  $echo > $output "\
 # $outputname - a libtool library file
 # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
@@ -4480,7 +4485,7 @@
 old_library='$old_library'
 
 # Libraries that this one depends upon.
-dependency_libs='$dependency_libs'
+dependency_libs='$dependency_libs_noepath'
 
 # Version information for $libname.
 current=$current