Index: libX11-1.3.4/m4/dolt.m4
===================================================================
--- libX11-1.3.4/m4/dolt.m4
+++ libX11-1.3.4/m4/dolt.m4
@@ -155,7 +155,7 @@ dnl without '=', because automake does n
     cat <<__DOLTLIBTOOL__EOF__ > doltlibtool
 #!$DOLT_BASH
 __DOLTLIBTOOL__EOF__
-    cat <<'__DOLTLIBTOOL__EOF__' >>doltlibtool
+    cat <<'__DOLTLIBTOOL__EOF__' | sed -e "s/@host_alias@/$host_alias/g" >>doltlibtool
 top_builddir_slash="${0%%doltlibtool}"
 : ${top_builddir_slash:=./}
 args=()
@@ -171,7 +171,7 @@ done
 if $modeok && $tagok ; then
     . ${top_builddir_slash}doltcompile "${args@<:@@@:>@}"
 else
-    exec ${top_builddir_slash}libtool "$[]@"
+    exec ${top_builddir_slash}@host_alias@-libtool "$[]@"
 fi
 __DOLTLIBTOOL__EOF__