From: Michael W. Hudson <mwh@python.net>
Date: Mon, 28 Jan 2002 15:07:45 +0000 (+0000)
Subject: It's merge time!
X-Git-Tag: v2.2.1c1~227
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=96baec20f2199ab89bd4725875831bead0295898;p=thirdparty%2FPython%2Fcpython.git

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 f4eb01de0584..a966931ede03 100644
--- 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