Index: intltool.m4
===================================================================
RCS file: /cvs/gnome/intltool/intltool.m4,v
retrieving revision 1.93
diff -u -p -r1.93 intltool.m4
--- intltool.m4	26 Apr 2006 12:09:19 -0000	1.93
+++ intltool.m4	13 May 2006 20:28:40 -0000
@@ -26,6 +26,7 @@ dnl IT_PROG_INTLTOOL([MINIMUM-VERSION], 
 # serial 34 IT_PROG_INTLTOOL
 AC_DEFUN([IT_PROG_INTLTOOL],
 [AC_PREREQ([2.50])dnl
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 
 case "$am__api_version" in
     1.[01234])
@@ -86,9 +87,10 @@ AC_SUBST(INTLTOOL_THEME_RULE)
 AC_SUBST(INTLTOOL_SERVICE_RULE)
 
 # Use the tools built into the package, not the ones that are installed.
-AC_SUBST(INTLTOOL_EXTRACT, '$(top_builddir)/intltool-extract')
-AC_SUBST(INTLTOOL_MERGE, '$(top_builddir)/intltool-merge')
-AC_SUBST(INTLTOOL_UPDATE, '$(top_builddir)/intltool-update')
+AC_SUBST(INTLTOOL_AUX_DIR, ${am_aux_dir})
+AC_SUBST(INTLTOOL_EXTRACT, '$(INTLTOOL_AUX_DIR)/intltool-extract')
+AC_SUBST(INTLTOOL_MERGE, '$(INTLTOOL_AUX_DIR)/intltool-merge')
+AC_SUBST(INTLTOOL_UPDATE, '$(INTLTOOL_AUX_DIR)/intltool-update')
 
 AC_PATH_PROG(INTLTOOL_PERL, perl)
 if test -z "$INTLTOOL_PERL"; then
@@ -134,21 +136,21 @@ dnl a reason for it.
 AC_CONFIG_COMMANDS([intltool], [
 
 for file in intltool-extract intltool-merge intltool-update; do
-  sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+  sed -e "s|@INTLTOOL_EXTRACT@|${am_aux_dir}/intltool-extract|g" \
       -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
       -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
       -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
       -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
       -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
       -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
-	< ${ac_aux_dir}/${file}.in > ${file}.out
-  if cmp -s ${file} ${file}.out 2>/dev/null; then
-    rm -f ${file}.out
+	< ${ac_aux_dir}/${file}.in > ${ac_aux_dir}/${file}.out
+  if cmp -s ${ac_aux_dir}/${file} ${ac_aux_dir}/${file}.out 2>/dev/null; then
+    rm -f ${ac_aux_dir}/${file}.out
   else
-    mv -f ${file}.out ${file}
+    mv -f ${ac_aux_dir}/${file}.out ${ac_aux_dir}/${file}
   fi
-  chmod ugo+x ${file}
-  chmod u+w ${file}
+  chmod ugo+x ${ac_aux_dir}/${file}
+  chmod u+w ${ac_aux_dir}/${file}
 done
 
 ],
@@ -168,6 +170,7 @@ INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
 #
 AC_DEFUN([IT_PO_SUBDIR],
 [AC_PREREQ([2.53])dnl We use ac_top_srcdir inside AC_CONFIG_COMMANDS.
+AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl
 dnl
 dnl The following CONFIG_COMMANDS should be exetuted at the very end
 dnl of config.status.
Index: intltoolize.in
===================================================================
RCS file: /cvs/gnome/intltool/intltoolize.in,v
retrieving revision 1.28
diff -u -p -r1.28 intltoolize.in
--- intltoolize.in	24 Nov 2005 17:36:41 -0000	1.28
+++ intltoolize.in	13 May 2006 20:28:41 -0000
@@ -240,16 +240,22 @@ if test "$auxdir" != .; then
 fi
 
 for file in $files; do
-  if test -f "$file" && test -z "$force"; then
-    test -z "$automake" && echo "$progname: '$file' exists: use '--force' to overwrite" 1>&2
+  if test `dirname $file` != "."; then
+    target=$cur/$file
+  else
+    target=$file
+  fi
+
+  if test -f "$target" && test -z "$force"; then
+    test -z "$automake" && echo "$progname: '$target' exists: use '--force' to overwrite" 1>&2
     continue
   fi
 
-  $rm $file
-  if test -n "$ln_s" && $ln_s $pkgdatadir/`basename $file` $file; then :
-  elif $cp $pkgdatadir/`basename $file` $file; then :
+  $rm $target
+  if test -n "$ln_s" && $ln_s $pkgdatadir/`basename $file` $target; then :
+  elif $cp $pkgdatadir/`basename $file` $target; then :
   else
-    echo "$progname: cannot copy '$pkgdatadir/`basename $file`' to '$file'" 1>&2
+    echo "$progname: cannot copy '$pkgdatadir/`basename $file`' to '$target'" 1>&2
     status=1
   fi
 done
