From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Thu, 15 Mar 2012 08:16:46 +0000 (+0100)
Subject: Merge branch 'maint'
X-Git-Tag: v1.11b~35
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=295c5f26d0646c6f2308fea50899dd961ef87abd;p=thirdparty%2Fautomake.git

Merge branch 'maint'

* maint:
  python: avoid failures due to $(am__py_compile) being undefined
  python: expose automake bug#10995

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

295c5f26d0646c6f2308fea50899dd961ef87abd
diff --cc tests/list-of-tests.mk
index 7665db137,b5a604cd0..70fc8c875
--- a/tests/list-of-tests.mk
+++ b/tests/list-of-tests.mk
@@@ -842,9 -728,7 +842,10 @@@ python9.test 
  python10.test \
  python11.test \
  python12.test \
 +python-dist.test \
 +python-vars.test \
 +python-virtualenv.test \
+ python-pr10995.test \
  recurs.test \
  recurs2.test \
  remake.test \
diff --cc tests/python.test
index 2200d639f,fe9d5939a..de8c0bbfb
--- a/tests/python.test
+++ b/tests/python.test
@@@ -32,13 -34,15 +32,19 @@@ mydir = ${prefix
  my_PYTHON = d.py
  END
  
+ # For automake bug#10995.
+ cat > Makefile3.am << 'END'
+ noinst_PYTHON = un.py
+ python_PYTHON = in.py
+ END
+ 
  $ACLOCAL
 -$AUTOMAKE -a
  
 +AUTOMAKE_fails
 +grep '^Makefile\.am:1:.* required file.*py-compile' stderr
 +
 +$AUTOMAKE -a
 +grep '^py_compile *=' Makefile.in
  test -f py-compile
  
  $AUTOMAKE Makefile2