Mercurial > hg > octave-lojdl > gnulib-hg

changeset 10969:4c304a656b87

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix a gnulib-tool failure.
author Bruno Haible <bruno@clisp.org>
date Thu, 25 Dec 2008 16:07:35 +0100
parents 2692e4e28041
children 51f263fdecd9
files ChangeLog gnulib-tool
diffstat 2 files changed, 10 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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+.
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -4032,7 +4032,9 @@
    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 @@
      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