From 94fab762de532de551987e1f48a125145f85304b Mon Sep 17 00:00:00 2001 From: Jack Jansen Date: Mon, 2 Sep 2002 12:29:11 +0000 Subject: [PATCH] Generate pythonw.sh on the fly. Use the build python for as many things as possible. --- Mac/OSX/Makefile | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile index 805e17319c4..7c89a972b67 100644 --- a/Mac/OSX/Makefile +++ b/Mac/OSX/Makefile @@ -155,7 +155,7 @@ MACLIBSUBDIRS= \ MACTOOLSDEST=$(prefix)/Mac/Tools MACTOOLSSRC=$(srcdir)/Mac/Tools MACTOOLSSUBDIRS=IDE -installmacsubtree: $(INSTALLED_PYTHON) +installmacsubtree: @for i in $(MACLIBDEST) $(MACTOOLSDEST); \ do \ if test ! -d $$i; then \ @@ -261,8 +261,8 @@ installmacsubtree: $(INSTALLED_PYTHON) $(INSTALL_DATA) $(srcdir)/Mac/OSX/Mac.pth $(LIBDEST)/site-packages/ $(PYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST) - $(INSTALLED_PYTHON) -Wi -tt $(srcdir)/Lib/compileall.py -x badsyntax $(MACLIBDEST) $(MACTOOLSDEST) - $(INSTALLED_PYTHON) -O -Wi -tt $(srcdir)/Lib/compileall.py -x badsyntax $(MACLIBDEST) $(MACTOOLSDEST) + $(PYTHON) -Wi -tt $(srcdir)/Lib/compileall.py -x badsyntax $(MACLIBDEST) $(MACTOOLSDEST) + $(PYTHON) -O -Wi -tt $(srcdir)/Lib/compileall.py -x badsyntax $(MACLIBDEST) $(MACTOOLSDEST) # Put symlinks "python" and "pythonw" in the standard place @@ -271,10 +271,12 @@ $(INSTALLED_PYTHONW): 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. -installunixtools: $(INSTALLED_PYTHON) $(INSTALLED_PYTHONW) $(srcdir)/Mac/OSX/pythonw.sh +installunixtools: $(INSTALLED_PYTHON) $(INSTALLED_PYTHONW) $(INSTALL) -d $(bindir) $(INSTALL_SYMLINK) $(INSTALLED_PYTHON) $(bindir)/python - $(INSTALL) $(srcdir)/Mac/OSX/pythonw.sh $(bindir)/pythonw + echo "#!/bin/sh" > pythonw.sh + echo "exec \"$(INSTALLED_PYTHONW)\" \"\$$@\"" >> pythonw.sh + $(INSTALL) pythonw.sh $(bindir)/pythonw # This is for development purposes: create a Mac.pth that refers to the source # directories