summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Jansen <jack.jansen@cwi.nl>2003-07-23 10:49:17 (GMT)
committerJack Jansen <jack.jansen@cwi.nl>2003-07-23 10:49:17 (GMT)
commitdffeaf473224ca425f01653a6c52a6fa8ed9592b (patch)
tree58ed65960bef8ffbaff419054811bb55a2454079
parent5943b4ac1067e5011b66697396d5df93b5ef9af0 (diff)
downloadcpython-dffeaf473224ca425f01653a6c52a6fa8ed9592b.zip
cpython-dffeaf473224ca425f01653a6c52a6fa8ed9592b.tar.gz
cpython-dffeaf473224ca425f01653a6c52a6fa8ed9592b.tar.bz2
Scripts runs with pythonw no longer had full window manager access due
to the name change of Python.app/Contents/MacOS/python to Python.app/Contents/MacOS/Python. Fixes #776116.
-rwxr-xr-xMac/OSX/Dist/resources/postflight2
-rw-r--r--Mac/OSX/Makefile4
2 files changed, 3 insertions, 3 deletions
diff --git a/Mac/OSX/Dist/resources/postflight b/Mac/OSX/Dist/resources/postflight
index d1ba76f..e5c7f9d 100755
--- a/Mac/OSX/Dist/resources/postflight
+++ b/Mac/OSX/Dist/resources/postflight
@@ -32,7 +32,7 @@ ln -fsh python$PYVER $TOOLDIR/python
rm -f $TOOLDIR/pythonw$PYVER
cat > $TOOLDIR/pythonw$PYVER <<EOF
#!/bin/sh
-exec "$DEST/Library/Frameworks/Python.framework/Versions/$PYVER/Resources/Python.app/Contents/MacOS/python" "\$@"
+exec "$DEST/Library/Frameworks/Python.framework/Versions/$PYVER/Resources/Python.app/Contents/MacOS/Python" "\$@"
EOF
chmod +x $TOOLDIR/pythonw$PYVER
ln -fsh pythonw$PYVER $TOOLDIR/pythonw
diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index 729f1ef..4908ee3 100644
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -18,7 +18,7 @@ APPINSTALLDIR=$(prefix)/Resources/Python.app
# Variables for installing the "normal" unix binaries
INSTALLED_PYTHON=$(prefix)/bin/python
-INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/python
+INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/Python
# Items more-or-less copied from the main Makefile
DIRMODE=755
@@ -230,7 +230,7 @@ installmacsubtree:
# We use the full name here in stead of $(INSTALLED_PYTHONW), because
# the latter may be overridden by Makefile.jaguar when building for a pre-installed
# /usr/bin/python
-$(APPINSTALLDIR)/Contents/MacOS/python: install_Python
+$(APPINSTALLDIR)/Contents/MacOS/Python: install_Python
# $(INSTALLED_PYTHON) has to be done by the main Makefile, we cannot do that here.
# At least this rule will give an error if it doesn't exist.