Merge branch 'maint'

* maint:
  remake: behave better with non-GNU make in subdirectories

diff --cc ChangeLog
index cb8adbcc355a7914dc210ecbcfe5f2bd34869ce2,fd1312eeaafef9c47388102bfebeb49cf33f1bd0..5e82c6dc0f1ca41606683c736be314ee8b357b89
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,3 -1,20 +1,18 @@@
 -      * tests/defs.in (using_gmake): New function, backported from the
 -      `master' branch (and simplified).
+ 2011-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
+ 
+       remake: behave better with non-GNU make in subdirectories
+       Currently, with every decent make program, it is possible to
+       rebuild out-of-date autotools-generated files with a simple
+       "make Makefile" -- but for this to work reliably with non-GNU
+       make implementations, the command must be issued from the
+       top-level directory.  This patch removes such limitation.
+       * lib/am/configure.am (am--refresh): Depend on `%MAKEFILE%'.
+       * tests/remake-subdir.test: New test.
+       * tests/remake-subdir2.test: Likewise.
+       * tests/remake-subdir-gnu.test: Likewise.
+       * tests/remake-subdir-from-subdir.test: Likewise.
+       * tests/Makefile.am (TESTS): Update.
+ 
  2011-05-29  Stefano Lattarini  <stefano.lattarini@gmail.com>
  
        automake, aclocal: honour configure-time AUTOCONF and AUTOM4TE

diff --cc Makefile.in
Simple merge

diff --cc tests/Makefile.am
index d1a3cda7a866e87f0af0973fddd1acad7d50df21,33ae8bc6220270fa4b02b18630680a0c7debb7e3..e68f6d70fbaf74c72b156f090b7a619a20852a42
--- 1/tests/Makefile.am
--- 2/tests/Makefile.am
+++ b/tests/Makefile.am
@@@ -796,28 -654,12 +796,32 @@@ remake4.test 
  remake5.test \
  remake6.test \
  remake7.test \
 +remake8a.test \
 +remake8b.test \
 +remake9a.test \
 +remake9b.test \
 +remake9c.test \
 +remake9d.test \
 +remake10a.test \
 +remake10b.test \
 +remake10c.test \
 +remake11.test \
 +remake12.test \
+ remake-subdir-from-subdir.test \
+ remake-subdir-gnu.test \
+ remake-subdir.test \
+ remake-subdir2.test \
 +remake-gnulib-add-acsubst.test \
 +remake-gnulib-add-header.test \
 +remake-gnulib-remove-header.test \
 +remake-moved-m4-file.test \
 +remake-deleted-m4-file.test \
 +remake-renamed-m4-file.test \
 +remake-renamed-m4-macro-and-file.test \
 +remake-renamed-m4-macro.test \
  pr8365-remake-timing.test \
  regex.test \
 +regex-obsolete.test \
  req.test \
  reqd.test \
  reqd2.test \

diff --cc tests/Makefile.in
index 44f8c974444374deea702957d3a82f6ffedd61d9,d7a1761c31fc5f3085ebcfe0a336682924c1cc23..7e5fd0964e707126b32d75b28ac2bbe767bb8669
--- 1/tests/Makefile.in
--- 2/tests/Makefile.in
+++ b/tests/Makefile.in
@@@ -1063,28 -925,12 +1063,32 @@@ remake4.test 
  remake5.test \
  remake6.test \
  remake7.test \
 +remake8a.test \
 +remake8b.test \
 +remake9a.test \
 +remake9b.test \
 +remake9c.test \
 +remake9d.test \
 +remake10a.test \
 +remake10b.test \
 +remake10c.test \
 +remake11.test \
 +remake12.test \
+ remake-subdir-from-subdir.test \
+ remake-subdir-gnu.test \
+ remake-subdir.test \
+ remake-subdir2.test \
 +remake-gnulib-add-acsubst.test \
 +remake-gnulib-add-header.test \
 +remake-gnulib-remove-header.test \
 +remake-moved-m4-file.test \
 +remake-deleted-m4-file.test \
 +remake-renamed-m4-file.test \
 +remake-renamed-m4-macro-and-file.test \
 +remake-renamed-m4-macro.test \
  pr8365-remake-timing.test \
  regex.test \
 +regex-obsolete.test \
  req.test \
  reqd.test \
  reqd2.test \