Kaydet (Commit) c361f94e authored tarafından Jack Jansen's avatar Jack Jansen

Got rid of symlink target, and in stead have "make dontinstallmacsubtree"

which uses a .pth file to add the Mac/Lib from your source tree to sys.path.

Also put the Python version number in a variable.Killed by signal 2.
üst e6691efa
...@@ -15,6 +15,7 @@ INSTALLED_PYTHON=$(INSTALLDIR)/bin/python ...@@ -15,6 +15,7 @@ INSTALLED_PYTHON=$(INSTALLDIR)/bin/python
INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/python INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/python
# Items more-or-less copied from the main Makefile # Items more-or-less copied from the main Makefile
VERSION=2.3
DIRMODE=755 DIRMODE=755
INSTALL=/usr/bin/install -c INSTALL=/usr/bin/install -c
INSTALL_SYMLINK=/usr/bin/install -l as INSTALL_SYMLINK=/usr/bin/install -l as
...@@ -204,7 +205,7 @@ installmacsubtree: ...@@ -204,7 +205,7 @@ installmacsubtree:
done; \ done; \
done done
$(INSTALL_DATA) $(PYTHONSRCDIR)/Mac/OSX/Mac.pth $(INSTALLDIR)/lib/python2.3/site-packages/ $(INSTALL_DATA) $(PYTHONSRCDIR)/Mac/OSX/Mac.pth $(INSTALLDIR)/lib/python$(VERSION)/site-packages/
# Put symlinks "python" and "pythonw" in the standard place # Put symlinks "python" and "pythonw" in the standard place
installunixprograms: $(INSTALLED_PYTHON) pythonw.sh installunixprograms: $(INSTALLED_PYTHON) pythonw.sh
...@@ -212,13 +213,12 @@ installunixprograms: $(INSTALLED_PYTHON) pythonw.sh ...@@ -212,13 +213,12 @@ installunixprograms: $(INSTALLED_PYTHON) pythonw.sh
$(INSTALL_SYMLINK) $(INSTALLED_PYTHON) $(UNIXBINDIR)/python $(INSTALL_SYMLINK) $(INSTALLED_PYTHON) $(UNIXBINDIR)/python
$(INSTALL) pythonw.sh $(UNIXBINDIR)/pythonw $(INSTALL) pythonw.sh $(UNIXBINDIR)/pythonw
# This is for development purposes: put a symlink to the Mac source subtree in the # This is for development purposes: create a Mac.pth that refers to the source
# framework # directories
symlinkmacsubtree: dontinstallmacsubtree:
ln -sf `cd $(PYTHONBUILDDIR)/Mac; pwd` $(INSTALLDIR)/Mac l=`cd $(PYTHONSRCDIR)/Mac/Lib; pwd`; \
echo $$l > $(INSTALLDIR)/lib/python$(VERSION)/site-packages/Mac.pth ; \
@echo '** Copy the contents of sample_sitecustomize.py (or similar code) into' echo $$l/lib-scriptpackages >> $(INSTALLDIR)/lib/python$(VERSION)/site-packages/Mac.pth
@echo '**' $(INSTALLDIR)/lib/python2.3/sitecustomize.py
# Rules to build each file in OBJECTS - is there a better way? # Rules to build each file in OBJECTS - is there a better way?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment