Fix a gnulib-tool failure.

diff --git a/ChangeLog b/ChangeLog
index c267222c0a9c743c6d78c3587a4d84c520b145f8..703e62148ec2660bfccbbacd7d42bb321c3e24c0 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-25  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_create_testdir): Avoid failure of mv command.
+
 2008-12-25  Bruno Haible  <bruno@clisp.org>
 
        * modules/btowc (License): Relicense under LGPLv2+.

diff --git a/gnulib-tool b/gnulib-tool
index 679d12fe55573a6940eb37221e6e149f9befd03e..bc3effb45cfd3e6ee4220175d915a277efe179df 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -4032,7 +4032,9 @@ func_create_testdir ()
    if test -f $m4base/gettext.m4; then
      func_execute_command ${AUTOPOINT} --force || func_exit 1
      for f in $m4base/*.m4~; do
-       mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1
+       if test -f $f; then
+         mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1
+       fi
      done
    fi
    func_execute_command ${ACLOCAL} -I $m4base || func_exit 1
@@ -4051,7 +4053,9 @@ func_create_testdir ()
      if test -f ../$m4base/gettext.m4; then
        func_execute_command ${AUTOPOINT} --force || func_exit 1
        for f in ../$m4base/*.m4~; do
-         mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1
+         if test -f $f; then
+           mv -f $f `echo $f | sed -e 's,~$,,'` || func_exit 1
+         fi
        done
      fi
      func_execute_command ${ACLOCAL} -I ../$m4base || func_exit 1