[Python-checkins] cpython (merge 3.2 -> default): - Issue #15591: Fix parsing MAKEFLAGS in the sharedmods target.

[matthias.klose]

http://hg.python.org/cpython/rev/3a3fd48a6ef7
changeset:   78785:3a3fd48a6ef7
parent:      78781:0fb511659ef4
parent:      78784:763d188a96bb
user:        Matthias Klose <doko at ubuntu.com>
date:        Tue Aug 28 19:00:01 2012 +0200
summary:
  - Issue #15591: Fix parsing MAKEFLAGS in the sharedmods target.

files:
  Makefile.pre.in |  7 ++++++-
  1 files changed, 6 insertions(+), 1 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -475,7 +475,12 @@
 
 # Build the shared modules
 sharedmods: $(BUILDPYTHON) $(SYSCONFIGDATA)
-	case $$MAKEFLAGS in *s*) quiet=-q; esac; \
+        if which getopt >/dev/null; then \
+	  mflags=`getopt s $$MAKEFLAGS 2>/dev/null | sed 's/ --.*/ /'`; \
+	else \
+	  mflags=" $$MAKEFLAGS "; \
+	fi; \
+	case $$mflags in "* -s *") quiet=-q; esac; \
 	$(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' \
 		$(PYTHON_FOR_BUILD) $(srcdir)/setup.py $$quiet build
 

-- 
Repository URL: http://hg.python.org/cpython