>From eda1f5cae4776e74169e4871a80a7f7832fe8c68 Mon Sep 17 00:00:00 2001
From: Paul Eggert <address@hidden>
Date: Sun, 24 Jan 2016 14:24:35 -0800
Subject: [PATCH] gnulib-tool: don't give up on ln -s so easily

* gnulib-tool (func_ln_s): Don't give up on a later ln -s merely
because an earlier one failed.  The targets could be on different
file systems.  Problem reported by KO Myung-Hun in:
http://lists.gnu.org/archive/html/bug-gnulib/2016-01/msg00081.html
---
 ChangeLog   | 6 ++++++
 gnulib-tool | 3 ---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index fab0ffb..1d27b8a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2016-01-24  Paul Eggert  <address@hidden>
 
+	gnulib-tool: don't give up on ln -s so easily
+	* gnulib-tool (func_ln_s): Don't give up on a later ln -s merely
+	because an earlier one failed.  The targets could be on different
+	file systems.  Problem reported by KO Myung-Hun in:
+	http://lists.gnu.org/archive/html/bug-gnulib/2016-01/msg00081.html
+
 	closedir: fix OS/2-related typos
 	Problem reported by KO Myung-Hun in:
 	http://lists.gnu.org/archive/html/bug-gnulib/2016-01/msg00107.html
diff --git a/gnulib-tool b/gnulib-tool
index dc4eb87..45d5fe0 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -773,9 +773,6 @@ func_ln_s ()
 {
   ln -s "$1" "$2" || {
     echo "$progname: ln -s failed; falling back on cp -p" >&2
-    symbolic=
-    lsymbolic=
-    do_copyrights=true
 
     case "$1" in
       /* | ?:*) # SRC is absolute.
-- 
2.5.0