summaryrefslogtreecommitdiffstats
path: root/Mac
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2002-07-08 13:34:23 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2002-07-08 13:34:23 (GMT)
commitc361f94e1c6cfea06263161f8e36e83e86ac14b7 (patch)
tree1ea71b851062fa9a81e2d09a197d60ac90bd344b /Mac
parente6691efa0fdd5a0a6d770ff7fc17aa9e6bb0735e (diff)
downloadcpython-c361f94e1c6cfea06263161f8e36e83e86ac14b7.zip
cpython-c361f94e1c6cfea06263161f8e36e83e86ac14b7.tar.gz
cpython-c361f94e1c6cfea06263161f8e36e83e86ac14b7.tar.bz2
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.
Diffstat (limited to 'Mac')
-rw-r--r--Mac/OSX/Makefile16
1 files changed, 8 insertions, 8 deletions
diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index aadf340..a13b783 100644
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -15,6 +15,7 @@ INSTALLED_PYTHON=$(INSTALLDIR)/bin/python
INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/python
# Items more-or-less copied from the main Makefile
+VERSION=2.3
DIRMODE=755
INSTALL=/usr/bin/install -c
INSTALL_SYMLINK=/usr/bin/install -l as
@@ -204,7 +205,7 @@ installmacsubtree:
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
installunixprograms: $(INSTALLED_PYTHON) pythonw.sh
@@ -212,13 +213,12 @@ installunixprograms: $(INSTALLED_PYTHON) pythonw.sh
$(INSTALL_SYMLINK) $(INSTALLED_PYTHON) $(UNIXBINDIR)/python
$(INSTALL) pythonw.sh $(UNIXBINDIR)/pythonw
-# This is for development purposes: put a symlink to the Mac source subtree in the
-# framework
-symlinkmacsubtree:
- ln -sf `cd $(PYTHONBUILDDIR)/Mac; pwd` $(INSTALLDIR)/Mac
-
- @echo '** Copy the contents of sample_sitecustomize.py (or similar code) into'
- @echo '**' $(INSTALLDIR)/lib/python2.3/sitecustomize.py
+# This is for development purposes: create a Mac.pth that refers to the source
+# directories
+dontinstallmacsubtree:
+ l=`cd $(PYTHONSRCDIR)/Mac/Lib; pwd`; \
+ echo $$l > $(INSTALLDIR)/lib/python$(VERSION)/site-packages/Mac.pth ; \
+ echo $$l/lib-scriptpackages >> $(INSTALLDIR)/lib/python$(VERSION)/site-packages/Mac.pth
# Rules to build each file in OBJECTS - is there a better way?