From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 11 Apr 2012 09:04:56 +0000 (+0200)
Subject: Merge branch 'rmch'
X-Git-Tag: v1.11b~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=76f0605a6dd790ab43cc608db11ac2141ddf46c0;p=thirdparty%2Fautomake.git

Merge branch 'rmch'

* rmch:
  maint: simplify generation of files with @substed@ stuff
  t/README: update w.r.t. recent overhaul (non-recursive build system)
  docs: fix names of relevant test cases in comments
  NEWS: automake build systems avoids make recursion
  maint: no more make recursion in Automake's build system
  tests: rename 'tests/' => 't/', '*.test' => '*.sh'
  tests: remove recipes that run tests with 'prove'
  tests: move most helper scripts and files into the 'ax' subdirectory
---

76f0605a6dd790ab43cc608db11ac2141ddf46c0
diff --cc t/instdir-cond.sh
index 2965ff19d,2965ff19d..2965ff19d
mode 100755,100644..100755
--- a/t/instdir-cond.sh
+++ b/t/instdir-cond.sh
diff --cc t/instdir-cond2.sh
index 1fc24b70d,1fc24b70d..1fc24b70d
mode 100755,100644..100755
--- a/t/instdir-cond2.sh
+++ b/t/instdir-cond2.sh