diff options
| author | Steven Drake <sbd@NetBSD.org> | 2012-03-15 09:12:00 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-03-15 09:13:38 +0100 |
| commit | 819005ae2c86c3ef4b77bea7176bb6d8b67ebd64 (patch) | |
| tree | 234454ffe04691c97d9e0f4c775104a93c854547 | |
| parent | 463b6405380ac3ff266f980d30cfeeb55eb796ee (diff) | |
| download | automake-819005ae2c86c3ef4b77bea7176bb6d8b67ebd64.tar.gz | |
python: avoid failures due to $(am__py_compile) being undefined
Fixes automake bug#10995, introduced in commit v1.11-372-gb46debf.
* lib/am/python.am: Move the definition of 'am__py_compile' to
ensure it is always emitted in the output Makefile.in. Previously,
this wouldn't have happened if the input Makefile.am contained a
'noinst_PYTHON' declaration before a 'python_PYTHON' one.
* tests/Makefile.am (XFAIL_TESTS): Remove 'python-pr10995.test' and
'python.test'.
* NEWS: Update.
Copyright-paperwork-exempt: yes
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | lib/am/python.am | 6 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
3 files changed, 6 insertions, 5 deletions
@@ -129,6 +129,9 @@ Bugs fixed in 1.11.0a: - Automake now correctly recognizes the prefix/primary combination `pkglibexec_SCRIPTS' as valid. + - A definition of 'noinst_PYTHON' before 'python_PYTHON' (or similar) + don't cause spurious failures upon "make install" anymore. + * Bugs introduced by 1.11: - The parallel-tests harness doesn't trip anymore on sed implementations diff --git a/lib/am/python.am b/lib/am/python.am index 427c95d0c..bb2748cd2 100644 --- a/lib/am/python.am +++ b/lib/am/python.am @@ -1,6 +1,5 @@ ## automake - create Makefile.in from Makefile.am -## Copyright (C) 1999, 2001, 2003, 2004, 2006, 2007, 2008, 2009, 2011 -## Free Software Foundation, Inc. +## Copyright (C) 1999-2012 Free Software Foundation, Inc. ## This program is free software; you can redistribute it and/or modify ## it under the terms of the GNU General Public License as published by @@ -19,12 +18,13 @@ if %?INSTALL% include inst-vars.am endif %?INSTALL% +?FIRST?am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) + ## ------------ ## ## Installing. ## ## ------------ ## if %?INSTALL% -?FIRST?am__py_compile = PYTHON=$(PYTHON) $(SHELL) $(py_compile) am__installdirs += "$(DESTDIR)$(%NDIR%dir)" .PHONY install-%EXEC?exec:data%-am: install-%DIR%PYTHON install-%DIR%PYTHON: $(%DIR%_PYTHON) diff --git a/tests/Makefile.am b/tests/Makefile.am index 005a1def1..9cac904a1 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -30,8 +30,6 @@ java-nobase.test \ objext-pr10128.test \ pr8365-remake-timing.test \ lex-subobj-nodep.test \ -python.test \ -python-pr10995.test \ remake-am-pr10111.test \ remake-m4-pr10111.test \ txinfo5.test |