Fix cmp invocation.

diff --git a/ChangeLog b/ChangeLog
index 7e0abe81e38387e105161c285d1aa873fba13db6..e2a30b4e617ffd3991d78d7366d18ee2b5e27513 100644 (file)
--- 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>
 

diff --git a/gnulib-tool b/gnulib-tool
index 5f8e9dc29779d706e96b4ff76b11561f9955b9da..757ad7c8e8fcbfa3e5b75634b4027c4451732a1a 100755 (executable)
--- 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 @@ func_import ()
       # 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"