Mercurial > hg > octave-lyh > gnulib-hg
changeset 6213:9a9a8d4d92e7
Fix cmp invocation.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Mon, 05 Sep 2005 11:40:42 +0000 |
parents | 8f96fca2b376 |
children | afb93b90dcb8 |
files | ChangeLog gnulib-tool |
diffstat | 2 files changed, 8 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,15 @@ +2005-09-05 Bruno Haible <bruno@clisp.org> + + * gnulib-tool (func_import): Fix comparison in handling of symbolic + links. + 2005-09-04 Martin Lambers <marlam@marlam.de> (tiny change) * modules/size_max (Makefile.am): Add size_max.h 2005-09-04 Derek Price <derek@ximbiot.com> - * gnulib-tool: Fix reversed $symbolic logic. + * gnulib-tool (func_import): Fix reversed $symbolic logic. 2005-09-03 Simon Josefsson <jas@extundo.com>
--- a/gnulib-tool +++ b/gnulib-tool @@ -22,7 +22,7 @@ progname=$0 package=gnulib -cvsdatestamp='$Date: 2005-09-04 15:57:34 $' +cvsdatestamp='$Date: 2005-09-05 11:40:42 $' last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'` version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'` @@ -988,7 +988,7 @@ # frequently that developers don't put autogenerated files into CVS. echo "Copying file $g2" test -n "$dry_run" && dry=echo - if test -n "$symbolic" && cmp "$gnulib_dir/$f2" "$destdir/$g2.tmp"; then + if test -n "$symbolic" && cmp "$gnulib_dir/$f2" "$destdir/$g2.tmp" > /dev/null; then func_ln_if_changed "$gnulib_dir/$f2" "$destdir/$g2" else $dry mv -f "$destdir/$g2.tmp" "$destdir/${g2}" || func_fatal_error "failed"