From: Bruno Haible <bruno@clisp.org>
Date: Sun, 29 Jun 2008 23:44:56 +0000 (+0200)
Subject: Put gnulib-comp.m4 into .cvsignore or .gitignore.
X-Git-Tag: v0.1~7218
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=a9f87fb62cd756b2016092a53e0fe27919ae9561;p=gnulib.git

Put gnulib-comp.m4 into .cvsignore or .gitignore.
---

diff --git a/ChangeLog b/ChangeLog
index 6fd7c07ed..7a8b2dd86 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2008-06-29  Bruno Haible  <bruno@clisp.org>
 
+	* gnulib-tool (func_import): Put gnulib-comp.m4 into .cvsignore or
+	.gitignore.
+	Reported by Sylvain Beucler <beuc@beuc.net>.
+
+2008-06-29  Bruno Haible  <bruno@clisp.org>
+
 	* doc/gnulib-tool.texi (VCS Issues): Mention --no-vc-files option.
 	* m4/gnulib-tool.m4: Update to match current gnulib-tool.
 
diff --git a/gnulib-tool b/gnulib-tool
index 989869d07..9798eaa19 100755
--- a/gnulib-tool
+++ b/gnulib-tool
@@ -3248,6 +3248,8 @@ func_import ()
     # Update the .cvsignore and .gitignore files.
     { echo "$added_files" | sed -e '/^$/d' -e 's,\([^/]*\)$,|A|\1,'
       echo "$removed_files" | sed -e '/^$/d' -e 's,\([^/]*\)$,|R|\1,'
+      # Treat gnulib-comp.m4 like an added file, even if it already existed.
+      echo "$m4base/|A|gnulib-comp.m4"
     } | LC_ALL=C sort -t'|' -k1,1 > "$tmp"/fileset-changes
     { # Rearrange file descriptors. Needed because "while ... done < ..."
       # constructs are executed in a subshell e.g. by Solaris 10 /bin/sh.