Rooba
/
cpython
mirror of https://github.com/python/cpython.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Two OSX fixes related to switching Python versions in an existing sourcetree: 

- Create the Python.framework/Versions/$(VERSION) dir if it doesn't exist
- Override existing symlinks in the framework.
This commit is contained in:
Jack Jansen 2002-02-12 21:30:53 +00:00
parent b48d198c12
commit 246debbbc2
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Makefile.pre.in
View File

@ -347,6 +347,7 @@ libpython$(VERSION).so: $(LIBRARY)
# This rule is here for OPENSTEP/Rhapsody/MacOSX # This rule is here for OPENSTEP/Rhapsody/MacOSX
$(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): $(LIBRARY) $(PYTHONFRAMEWORKDIR) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): $(LIBRARY) $(PYTHONFRAMEWORKDIR)
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \ libtool -o $(LDLIBRARY) -dynamic $(OTHER_LIBTOOL_OPT) $(LIBRARY) \
-framework System @LIBTOOL_CRUFT@ -framework System @LIBTOOL_CRUFT@
@ -758,10 +759,10 @@ $(PYTHONFRAMEWORKDIR): $(RESSRCDIR)/Info.plist \
$(INSTALL_DATA) $(RESSRCDIR)/version.plist $(FRAMEWORKDEST)/Resources/version.plist $(INSTALL_DATA) $(RESSRCDIR)/version.plist $(FRAMEWORKDEST)/Resources/version.plist
$(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \ $(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
$(FRAMEWORKDEST)/Resources/English.lproj/InfoPlist.strings $(FRAMEWORKDEST)/Resources/English.lproj/InfoPlist.strings
$(LN) -fs $(VERSION) $(PYTHONFRAMEWORKDIR)/Versions/Current $(LN) -fsh $(VERSION) $(PYTHONFRAMEWORKDIR)/Versions/Current
$(LN) -fs Versions/Current/Python $(PYTHONFRAMEWORKDIR)/Python $(LN) -fsh Versions/Current/Python $(PYTHONFRAMEWORKDIR)/Python
$(LN) -fs Versions/Current/Headers $(PYTHONFRAMEWORKDIR)/Headers $(LN) -fsh Versions/Current/Headers $(PYTHONFRAMEWORKDIR)/Headers
$(LN) -fs Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources $(LN) -fsh Versions/Current/Resources $(PYTHONFRAMEWORKDIR)/Resources
# On install, we re-make the framework # On install, we re-make the framework
# structure in the install location, /Library/Frameworks/ or the argument to # structure in the install location, /Library/Frameworks/ or the argument to
@ -789,10 +790,10 @@ frameworkinfrastructureinstall: $(LDLIBRARY)
$(INSTALL_DATA) $(RESSRCDIR)/version.plist $(FRAMEWORKFINALDEST)/Resources/version.plist $(INSTALL_DATA) $(RESSRCDIR)/version.plist $(FRAMEWORKFINALDEST)/Resources/version.plist
$(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \ $(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
$(FRAMEWORKFINALDEST)/Resources/English.lproj/InfoPlist.strings $(FRAMEWORKFINALDEST)/Resources/English.lproj/InfoPlist.strings
$(LN) -fs $(VERSION) $(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current $(LN) -fsh $(VERSION) $(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
$(LN) -fs Versions/Current/Python $(PYTHONFRAMEWORKINSTALLDIR)/Python $(LN) -fsh Versions/Current/Python $(PYTHONFRAMEWORKINSTALLDIR)/Python
$(LN) -fs Versions/Current/Headers $(PYTHONFRAMEWORKINSTALLDIR)/Headers $(LN) -fsh Versions/Current/Headers $(PYTHONFRAMEWORKINSTALLDIR)/Headers
$(LN) -fs Versions/Current/Resources $(PYTHONFRAMEWORKINSTALLDIR)/Resources $(LN) -fsh Versions/Current/Resources $(PYTHONFRAMEWORKINSTALLDIR)/Resources
$(INSTALL_DATA) $(LDLIBRARY) $(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY) $(INSTALL_DATA) $(LDLIBRARY) $(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
# Build the toplevel Makefile # Build the toplevel Makefile