]> granicus.if.org Git - python/commitdiff
Avoid spurious non-fatal install errors for OS X frameworks:
authorNed Deily <nad@acm.org>
Mon, 8 Jul 2013 21:33:03 +0000 (14:33 -0700)
committerNed Deily <nad@acm.org>
Mon, 8 Jul 2013 21:33:03 +0000 (14:33 -0700)
for a framework install, the python shared library is installed in
the frameworkinstallstructure target, not in altbininstall.

Makefile.pre.in

index abfc64e79f605525e38daceea6f6c21811681a3d..00e589fcf78cd45d15ac8cb22c758978392b4364 100644 (file)
@@ -945,7 +945,7 @@ altbininstall: $(BUILDPYTHON)
                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 \