--- orig/debian/changelog
+++ mod/debian/changelog
@@ -1,3 +1,15 @@
+libtool (1.5.6-4multiarch2) multiarch; urgency=low
+
+  * Whack the rules file to not sed out our multiarch directories.
+
+ -- Tollef Fog Heen <tfheen@idi.ntnu.no>  Tue,  1 Mar 2005 17:09:04 +0100
+
+libtool (1.5.6-4multiarch1) multiarch; urgency=low
+
+  * Multiarch upload; no changes
+
+ -- Tollef Fog Heen <tfheen@idi.ntnu.no>  Thu, 24 Feb 2005 16:12:40 +0100
+
 libtool (1.5.6-4) unstable; urgency=low
 
   * Correct accidental slide into a native package.

--- orig/debian/rules
+++ mod/debian/rules
@@ -78,7 +78,7 @@
 	sed -e 's/^\(predep_objects\)=.*/\1=""/' \
 	    -e 's/^\(postdep_objects\)=.*/\1=""/' \
 	    -e 's/^\(compiler_lib_search_path\)=.*/\1=""/' \
-	    -e 's:^\(sys_lib_search_path_spec\)=.*:\1="/lib/ /usr/lib/ /usr/X11R6/lib/ /usr/local/lib/":' \
+	    -e 's:^\(sys_lib_search_path_spec\)=.*:\1="/lib/ /lib/$(DEB_GNU_BUILD_TYPE) /usr/lib/ /usr/lib/$(DEB_GNU_BUILD_TYPE) /usr/X11R6/lib/ /usr/X11R6/lib/$(DEB_GNU_BUILD_TYPE) /usr/local/lib/ /usr/local/lib/$(DEB_GNU_BUILD_TYPE)":' \
 	    -e 's/^\(archive_cmds=\".*\) -nostdlib /\1 /' \
 	    -e 's/^\(archive_expsym_cmds=\".*\) -nostdlib /\1 /' \
 	    < libtool > libtool.gcc-indep

--- orig/libtool.m4
+++ mod/libtool.m4
@@ -1633,6 +1633,22 @@
   dynamic_linker=no
   ;;
 esac
+
+if test "$GCC" = yes; then
+   dumpmachine=$($CC -dumpmachine)
+   sys_lib_dlsearch_path_spec_tmp=""
+   for elem in $sys_lib_dlsearch_path_spec; do
+       sys_lib_dlsearch_path_spec_tmp="$sys_lib_dlsearch_path_spec_tmp $elem $elem/${dumpmachine}"
+   done
+   sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec_tmp
+
+   sys_lib_search_path_spec_tmp=""
+   for elem in $sys_lib_search_path_spec; do
+       sys_lib_search_path_spec_tmp="$sys_lib_search_path_spec_tmp $elem $elem/${dumpmachine}"
+   done
+   sys_lib_search_path_spec=$sys_lib_search_path_spec_tmp
+fi
+
 AC_MSG_RESULT([$dynamic_linker])
 test "$dynamic_linker" = no && can_build_shared=no
 ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER