]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
Merge branch 'micro' into maint
authorStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 23 May 2013 18:12:17 +0000 (20:12 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Thu, 23 May 2013 18:12:17 +0000 (20:12 +0200)
* micro:
  tests: avoid '$MAKE' redirections, use 'run_make' instead
  tests: avoid use of redirected 'run_make' invocations
  lint: warn against redirected 'run_make' invocations
  comments: next GNU make release 4.0, not 3.83
  tests: fix a potential spurious failure due to global config.site
  HACKING: it's OK to do testsuite refactoring in a micro version

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
14 files changed:
1  2 
HACKING
maintainer/syntax-checks.mk
t/ax/depcomp.sh
t/ccnoco3.sh
t/check8.sh
t/cscope.tap
t/libtool9.sh
t/ltorder.sh
t/silent-c.sh
t/silent-lex.sh
t/silent-lt.sh
t/silent-many-languages.sh
t/silent-nested-vars.sh
t/silent-yacc.sh

diff --cc HACKING
Simple merge
Simple merge
diff --cc t/ax/depcomp.sh
Simple merge
diff --cc t/ccnoco3.sh
Simple merge
diff --cc t/check8.sh
Simple merge
diff --cc t/cscope.tap
Simple merge
diff --cc t/libtool9.sh
Simple merge
diff --cc t/ltorder.sh
Simple merge
diff --cc t/silent-c.sh
Simple merge
diff --cc t/silent-lex.sh
Simple merge
diff --cc t/silent-lt.sh
Simple merge
Simple merge
Simple merge
Simple merge