From d2307f91c742df258b25eca6ede380bb3d6e1a34 Mon Sep 17 00:00:00 2001
From: Bruno Haible <bruno@clisp.org>
Date: Fri, 2 Sep 2005 11:18:48 +0000
Subject: [PATCH] Don't put symlinks unless asked for.

---
 ChangeLog   | 4 ++++
 gnulib-tool | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index c24e6b503e..32809576d0 100644
--- 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 a635863122..0bc390891c 100755
--- 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"
-- 
2.30.2