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

diff --git a/ChangeLog b/ChangeLog
index 6fd7c07ed10cbed674081908b8abea07223d15fd..7a8b2dd86223099d7da766b0dd0a90529d36af5a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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.

diff --git a/gnulib-tool b/gnulib-tool
index 989869d07e3445ecf2cbe929825cdf9bb5105263..9798eaa19f88a85b6e7999cb130cd341bba444bc 100755 (executable)
--- 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.