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

[matthias.klose]

http://hg.python.org/cpython/rev/1a1d097b17e2
changeset:   78783:1a1d097b17e2
branch:      2.7
user:        Matthias Klose <doko at ubuntu.com>
date:        Tue Aug 28 18:52:28 2012 +0200
summary:
  - Issue #15591: Fix parsing MAKEFLAGS in the sharedmods target.

files:
  Makefile.pre.in |  12 ++++++++----
  1 files changed, 8 insertions(+), 4 deletions(-)


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -407,10 +407,14 @@
 
 # Build the shared modules
 sharedmods: $(BUILDPYTHON)
-	@case $$MAKEFLAGS in \
-	*s*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
-	*) $(RUNSHARED) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
-	esac
+        if which getopt >/dev/null 2>&1; 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)' \
+		./$(BUILDPYTHON) -E $(srcdir)/setup.py $$quiet build
 
 # Build static library
 # avoid long command lines, same as LIBRARY_OBJS

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