>From 819005ae2c86c3ef4b77bea7176bb6d8b67ebd64 Mon Sep 17 00:00:00 2001
Message-Id: <address@hidden>
In-Reply-To: <address@hidden>
References: <address@hidden>
From: Steven Drake <address@hidden>
Date: Thu, 15 Mar 2012 09:12:00 +0100
Subject: [PATCH 2/2] 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 <address@hidden>
---
 NEWS              |    3 +++
 lib/am/python.am  |    6 +++---
 tests/Makefile.am |    2 --
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/NEWS b/NEWS
index 3a6d2c4..b998ce4 100644
--- a/NEWS
+++ b/NEWS
@@ -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 427c95d..bb2748c 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 005a1de..9cac904 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
-- 
1.7.9