[PATCH 1/6] python: run the 'py-compile' script with $(SHELL)

[Stefano Lattarini]

* lib/python.am (install-%DIR%PYTHON): Run each instance of
py-compile using $(SHELL).  Since we are at it, break overly
long lines.
(am__py_compile): New variable, to reduce code duplication.
---
 ChangeLog        |    8 ++++++++
 lib/am/python.am |   15 +++++++++------
 2 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cb9918f..d3ce17e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2011-06-08  Stefano Lattarini  <address@hidden>
+
+       python: run the 'py-compile' script with $(SHELL)
+       * lib/python.am (install-%DIR%PYTHON): Run each instance of
+       py-compile using $(SHELL).  Since we are at it, break overly
+       long lines.
+       (am__py_compile): New variable, to reduce code duplication.
+
 2011-06-02  Stefano Lattarini  <address@hidden>
 
        maintcheck: fix some failures, extend some checks
diff --git a/lib/am/python.am b/lib/am/python.am
index 9424a19..a8c19d7 100644
--- a/lib/am/python.am
+++ b/lib/am/python.am
@@ -1,6 +1,6 @@
 ## automake - create Makefile.in from Makefile.am
-## Copyright (C) 1999, 2001, 2003, 2004, 2006, 2007, 2008, 2009  Free
-## Software Foundation, Inc.
+## Copyright (C) 1999, 2001, 2003, 2004, 2006, 2007, 2008, 2009, 2011
+## 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
@@ -24,6 +24,7 @@ endif %?INSTALL%
 ## ------------ ##
 
 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)
@@ -53,9 +54,10 @@ if %?BASE%
 ## encoded in the actual files.
        if test -n "$$dlist"; then \
          if test -z "$(DESTDIR)"; then \
-           PYTHON=$(PYTHON) $(py_compile) --basedir "$(%NDIR%dir)" $$dlist; \
+           $(am__py_compile) --basedir "$(%NDIR%dir)" $$dlist; \
          else \
-           PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir 
"$(%NDIR%dir)" $$dlist; \
+           $(am__py_compile) --destdir "$(DESTDIR)" \
+                             --basedir "$(%NDIR%dir)" $$dlist; \
          fi; \
        else :; fi
 else !%?BASE%
@@ -77,9 +79,10 @@ else !%?BASE%
 ## encoded in the actual files.
          if test -n "$$dlist"; then \
            if test -z "$(DESTDIR)"; then \
-             PYTHON=$(PYTHON) $(py_compile) --basedir "$(%NDIR%dir)" $$dlist; \
+             $(am__py_compile) --basedir "$(%NDIR%dir)" $$dlist; \
            else \
-             PYTHON=$(PYTHON) $(py_compile) --destdir "$(DESTDIR)" --basedir 
"$(%NDIR%dir)" $$dlist; \
+             $(am__py_compile) --destdir "$(DESTDIR)" \
+                               --basedir "$(%NDIR%dir)" $$dlist; \
            fi; \
          else :; fi \
        done
-- 
1.7.2.3