From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 23 Jun 2011 08:34:39 +0000 (+0200)
Subject: Merge branch 'maint'
X-Git-Tag: ng-0.5a~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cb3e1296ac8a01fcf4b38d10584f218722655e1c;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  tests: fix bug in 'autodist.test'
---

cb3e1296ac8a01fcf4b38d10584f218722655e1c
diff --cc tests/autodist.test
index 681be0984,70ec0afe5..7e0fc37bc
--- a/tests/autodist.test
+++ b/tests/autodist.test
@@@ -21,9 -21,11 +21,9 @@@
  
  . ./defs || Exit 1
  
 -set -e
 -
  # Ensure we are run from the right directory.
  # (The last thing we want is to delete some random user files.)
- test -f ../defs-static
 -test -f ../defs
++test -f ../defs-static && test -f ../defs || Exit 99
  rm -f *
  
  cat > configure.in <<END