Don't put symlinks unless asked for.

diff --git a/ChangeLog b/ChangeLog
index c24e6b503e4b42ec47fc0f1db4c635cc24a231a0..32809576d0204efeb84fefe88fdbbd8b631ff62a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-01  Bruno Haible  <bruno@clisp.org>
+
+       * gnulib-tool (func_import): Fix handling of symbolic links.
+
 2005-09-01  Bruno Haible  <bruno@clisp.org>
 
        * gnulib-tool (import): In the first-use case, provide defaults.

diff --git a/gnulib-tool b/gnulib-tool
index a6358631223b13b18e225bc5725f92777ad566da..0bc390891c384ecc5585f43d473c254f729c84ef 100755 (executable)
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -22,7 +22,7 @@
 
 progname=$0
 package=gnulib
-cvsdatestamp='$Date: 2005-09-01 12:28:32 $'
+cvsdatestamp='$Date: 2005-09-02 11:18:48 $'
 last_checkin_date=`echo "$cvsdatestamp" | sed -e 's,^\$[D]ate: ,,'`
 version=`echo "$last_checkin_date" | sed -e 's/ .*$//' -e 's,/,-,g'`
 
@@ -976,7 +976,7 @@ func_import ()
         fi
         test -n "$dry_run" && dry=echo
         $dry mv -f "$destdir/$g2" "$destdir/${g2}~" || func_fatal_error "failed"
-        if test -z "$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"