[Python-checkins] cpython: Avoid spurious non-fatal install errors for OS X frameworks:

ned.deily python-checkins at python.org
Mon Jul 8 23:33:54 CEST 2013


http://hg.python.org/cpython/rev/c505ece63c80
changeset:   84516:c505ece63c80
user:        Ned Deily <nad at acm.org>
date:        Mon Jul 08 14:33:03 2013 -0700
summary:
  Avoid spurious non-fatal install errors for OS X frameworks:
for a framework install, the python shared library is installed in
the frameworkinstallstructure target, not in altbininstall.

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


diff --git a/Makefile.pre.in b/Makefile.pre.in
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -945,7 +945,7 @@
 		fi; \
 		(cd $(DESTDIR)$(BINDIR); $(LN) python$(LDVERSION)$(EXE) python$(VERSION)$(EXE)); \
 	fi
-	if test -f $(LDLIBRARY); then \
+	if test -f $(LDLIBRARY) && test "$(PYTHONFRAMEWORKDIR)" = "no-framework" ; then \
 		if test -n "$(DLLLIBRARY)" ; then \
 			$(INSTALL_SHARED) $(DLLLIBRARY) $(DESTDIR)$(BINDIR); \
 		else \

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


More information about the Python-checkins mailing list