changeset 29943:56d540c6e174

Put gnulib-comp.m4 into .cvsignore or .gitignore.
author Bruno Haible <bruno@clisp.org>
date Mon, 30 Jun 2008 01:44:56 +0200
parents 1c64d229a90f
children a75b9210841d
files ChangeLog gnulib-tool
diffstat 2 files changed, 8 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jun 30 01:28:02 2008 +0200
+++ b/ChangeLog	Mon Jun 30 01:44:56 2008 +0200
@@ -1,3 +1,9 @@
+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.
--- a/gnulib-tool	Mon Jun 30 01:28:02 2008 +0200
+++ b/gnulib-tool	Mon Jun 30 01:44:56 2008 +0200
@@ -3248,6 +3248,8 @@
     # 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.