It's merge time!

Backport loewis' checkin of revision 1.74:

Use BLDLIBRARY to build extension modules. Fixes #504252.
2.2.1 candidate.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index f4eb01de05844b67153e1c7aac9cdd8473c88188..a966931ede03b83ce301e4e16efa44e2c4638de7 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -303,8 +303,8 @@ platform: $(BUILDPYTHON)
 # Build the shared modules
 sharedmods: $(BUILDPYTHON)
        case $$MAKEFLAGS in \
-       *-s*) CC='$(CC)' LDSHARED='$(LDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
-       *) CC='$(CC)' LDSHARED='$(LDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
+       *-s*) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py -q build;; \
+       *) CC='$(CC)' LDSHARED='$(BLDSHARED)' OPT='$(OPT)' ./$(BUILDPYTHON) -E $(srcdir)/setup.py build;; \
        esac
 
 # buildno should really depend on something like LIBRARY_SRC