@@ -184,6 +184,8 @@ PYTHONFRAMEWORK= @PYTHONFRAMEWORK@
184
184
PYTHONFRAMEWORKDIR= @PYTHONFRAMEWORKDIR@
185
185
PYTHONFRAMEWORKPREFIX= @PYTHONFRAMEWORKPREFIX@
186
186
PYTHONFRAMEWORKINSTALLDIR= @PYTHONFRAMEWORKINSTALLDIR@
187
+ PYTHONFRAMEWORKINSTALLNAMEPREFIX= @PYTHONFRAMEWORKINSTALLNAMEPREFIX@
188
+ RESSRCDIR= @RESSRCDIR@
187
189
# Deployment target selected during configure, to be checked
188
190
# by distutils. The export statement is needed to ensure that the
189
191
# deployment target is active during build.
@@ -865,7 +867,7 @@ libpython3.so: libpython$(LDVERSION).so
865
867
$(BLDSHARED) $(NO_AS_NEEDED) -o $@ -Wl,-h$@ $^
866
868
867
869
libpython$(LDVERSION).dylib: $(LIBRARY_OBJS)
868
- $(CC) -dynamiclib -Wl,-single_module $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(prefix )/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(DTRACE_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
870
+ $(CC) -dynamiclib $(PY_CORE_LDFLAGS) -undefined dynamic_lookup -Wl,-install_name,$(PYTHONFRAMEWORKINSTALLNAMEPREFIX )/lib/libpython$(LDVERSION).dylib -Wl,-compatibility_version,$(VERSION) -Wl,-current_version,$(VERSION) -o $@ $(LIBRARY_OBJS) $(DTRACE_OBJS) $(SHLIBS) $(LIBC) $(LIBM); \
869
871
870
872
871
873
libpython$(VERSION).sl: $(LIBRARY_OBJS)
@@ -890,14 +892,13 @@ $(BUILDPYTHON)-gdb.py: $(SRC_GDB_HOOKS)
890
892
# This rule is here for OPENSTEP/Rhapsody/MacOSX. It builds a temporary
891
893
# minimal framework (not including the Lib directory and such) in the current
892
894
# directory.
893
- RESSRCDIR=Mac/Resources/framework
894
895
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
895
896
$(LIBRARY) \
896
897
$(RESSRCDIR)/Info.plist
897
898
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
898
899
$(CC) -o $(LDLIBRARY) $(PY_CORE_LDFLAGS) -dynamiclib \
899
- -all_load $(LIBRARY) -Wl,-single_module \
900
- -install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR )/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
900
+ -all_load $(LIBRARY) \
901
+ -install_name $(PYTHONFRAMEWORKINSTALLNAMEPREFIX )/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
901
902
-compatibility_version $(VERSION) \
902
903
-current_version $(VERSION) \
903
904
-framework CoreFoundation $(LIBS);
@@ -1983,7 +1984,7 @@ multissltest: all
1983
1984
# which can lead to two parallel `./python setup.py build` processes that
1984
1985
# step on each others toes.
1985
1986
.PHONY: install
1986
- install: @FRAMEWORKINSTALLFIRST@ commoninstall bininstall maninstall @FRAMEWORKINSTALLLAST@
1987
+ install: @FRAMEWORKINSTALLFIRST@ @INSTALLTARGETS@ @FRAMEWORKINSTALLLAST@
1987
1988
if test "x$(ENSUREPIP)" != "xno" ; then \
1988
1989
case $(ENSUREPIP) in \
1989
1990
upgrade) ensurepip="--upgrade" ;; \
0 commit comments