# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1230588655 -3600
# Node ID 78dea9790e0f7d43fb8c84239ce59c8e076e1e8b
# Parent  d54e63808f25a96c285e3c00badb50916bf97645
Fix small bug in update of .cvsignore or .gitignore.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-29  Bruno Haible  <bruno@clisp.org>
+
+	* gnulib-tool (func_import): When generating sed-ignore-removed, handle
+	files in subdirectories correctly.
+	Reported by Ralf Wildenhues.
+
 2008-12-29  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	* gnulib-tool (func_update_ignorelist): Use 'join - FILE'
diff --git a/gnulib-tool b/gnulib-tool
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3464,8 +3464,8 @@
               if $doit; then
                 echo "Updating $destdir/$dir$ignore (backup in $destdir/$dir${ignore}~)"
                 mv -f "$destdir/$dir$ignore" "$destdir/$dir$ignore"~
-                { sed -e 's,^,/^,' -e 's,$,\$/d,' < "$tmp"/ignore-removed
-                  if test -n "$anchor"; then sed -e "s,^,/^${doubly_escaped_anchor}," -e 's,$,\$/d,' < "$tmp"/ignore-removed; fi
+                { sed -e 's,/,\\/,g' -e 's,^,/^,' -e 's,$,\$/d,' < "$tmp"/ignore-removed
+                  if test -n "$anchor"; then sed -e 's,/,\\/,g' -e "s,^,/^${doubly_escaped_anchor}," -e 's,$,\$/d,' < "$tmp"/ignore-removed; fi
                 } > "$tmp"/sed-ignore-removed
                 { cat "$destdir/$dir$ignore"~
                   sed -e "s|^|$anchor|" < "$tmp"/ignore-added