Merge branch 'maint'

* maint:
  gitignore: use only one .gitignore file, in the top-level directory
  tests: one more fixlet for gettext macros requirement
  tests: fix handling of gettext macros requirement
  tests: fix failure due to debugging code forgotten into a test

diff --cc .gitignore
index 96d603ea08ac2f69fd9bdcf11a55aea91ab03be0,47823214e8779b2f68c3d49597615a5dcab51944..552fa1761402814c610de9e5b74514e33ef3bbd7
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -8,11 -8,53 +8,61 @@@ Makefil
  /config.status
  /config.status.lineno
  /configure.lineno
- Makefile.in
- Makefile
+ /aclocal
+ /automake
+ /doc/amhello-*.tar.gz
+ /doc/automake.info
+ /doc/automake.info-[0-9]
+ /doc/automake*.1
+ /doc/aclocal*.1
+ /doc/stamp-vti
+ /doc/version.texi
+ /doc/automake.ac
+ /doc/automake.aux
+ /doc/automake.cm
+ /doc/automake.cp
+ /doc/automake.cps
+ /doc/automake.dvi
+ /doc/automake.fn
+ /doc/automake.fns
+ /doc/automake.html
+ /doc/automake.ky
+ /doc/automake.log
+ /doc/automake.op
+ /doc/automake.pdf
+ /doc/automake.pg
+ /doc/automake.ps
+ /doc/automake.toc
+ /doc/automake.tp
+ /doc/automake.tr
+ /doc/automake.vr
+ /doc/automake.vrs
+ /doc/amhello/Makefile.in
+ /doc/amhello/aclocal.m4
+ /doc/amhello/config.h.in
+ /doc/amhello/config.h.in~
+ /doc/amhello/configure
+ /doc/amhello/depcomp
+ /doc/amhello/install-sh
+ /doc/amhello/missing
+ /lib/Automake/Config.pm
+ /lib/Automake/tests/*.log
+ /lib/Automake/tests/*.log-t
+ /tests/*.log
+ /tests/*.log-t
+ /tests/*.dir
 -/tests/*-p.test
+ /tests/aclocal-1.*
+ /tests/automake-1.*
 -/tests/defs
++/tests/defs-static
++/tests/instspc-tests.am
+ /tests/parallel-tests.am
++/tests/instspc-*-build.test
++/tests/instspc-*-install.test
++/tests/*.test-t
++/tests/*-p.test
 +cscope.files
 +cscope.in.out
 +cscope.out
 +cscope.po.out
  tags
  TAGS

diff --cc ChangeLog
Simple merge