Build PythonLauncher for MacPython-OSX 2.2 as well.
diff --git a/Mac/OSX/Makefile b/Mac/OSX/Makefile
index 9a76fb6..4c9b4c8 100644
--- a/Mac/OSX/Makefile
+++ b/Mac/OSX/Makefile
@@ -11,7 +11,8 @@
# These are normally glimpsed from the previous set
bindir=$(dstroot)/usr/local/bin
-PYTHONAPPSDIR=$(dstroot)/Applications/Python
+PYTHONAPPSPATH=/Applications/Python
+PYTHONAPPSDIR=$(dstroot)$(PYTHONAPPSPATH)
APPINSTALLDIR=$(prefix)/Resources/Python.app
PTHFILE=$(srcdir)/Mac/OSX/Mac.pth
@@ -50,7 +51,8 @@
install_PythonLauncher:
cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
- pbxbuild -target PythonLauncher -buildstyle Deployment DSTROOT=$(dstroot) install
+ pbxbuild -target PythonLauncher -buildstyle Deployment \
+ DSTROOT=$(dstroot) INSTALL_PATH=$(PYTHONAPPSPATH) install
install_Python: $(PYTHON)
@for i in $(PYTHONAPPSDIR) $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
diff --git a/Mac/OSX/Makefile.jaguar b/Mac/OSX/Makefile.jaguar
index 93a5715..42dde6b 100644
--- a/Mac/OSX/Makefile.jaguar
+++ b/Mac/OSX/Makefile.jaguar
@@ -6,7 +6,8 @@
builddir = ../..
srcdir = ../..
dstroot=/.
-PYTHONAPPSDIR=$(dstroot)/Applications/MacPython-OSX
+PYTHONAPPSPATH=/Applications/MacPython-OSX
+PYTHONAPPSDIR=$(dstroot)$(PYTHONAPPSPATH)
prefix=/usr
# These are normally computed form the previous ones
@@ -29,9 +30,20 @@
INSTALL_SCRIPT= ${INSTALL_PROGRAM}
INSTALL_DATA= ${INSTALL} -m 644
-install: install_dirs install_dynlib install_lib \
+# These can be done as a normal user
+install: preflight install_dirs install_dynlib install_lib \
install_Python install_IDE install_IDLE install_BuildApplet \
- install_pythonw
+ install_PythonLauncher install_pythonw
+
+preflight:
+ @if test ! -w $(LIBDEST)/site-packages; then \
+ echo Please make directory $(LIBDEST)/site-packages writeable; \
+ exit 1; \
+ fi
+ @if grep "arch i386" $(LIBDEST)/config/Makefile >/dev/null; then \
+ echo Please edit $(LIBDEST)/config/Makefile, see README.JAGUAR; \
+ exit 1; \
+ fi
install_dirs:
$(INSTALL) -d -m $(DIRMODE) $(PYTHONAPPSDIR)
@@ -75,7 +87,16 @@
srcdir=$(srcdir) INSTALLED_PYTHONW=$(INSTALLED_PYTHONW) \
PYTHONAPPSDIR=$(PYTHONAPPSDIR)
+install_PythonLauncher:
+ $(MAKE) -f $(osxdir)/Makefile install_PythonLauncher \
+ srcdir=$(srcdir) dstroot=$(dstroot) \
+ PYTHONAPPSPATH=$(PYTHONAPPSPATH)
+
install_pythonw:
+ @if test ! -w $(prefix)/bin; then \
+ echo Cannot write to $(prefix)/bin, use \"sudo make -f Makefile.jaguar install_pythonw\"; \
+ exit 1; \
+ fi
echo "#!/bin/sh" > pythonw.sh
echo "exec \"$(INSTALLED_PYTHONW)\" \"\$$@\"" >> pythonw.sh
$(INSTALL) pythonw.sh $(prefix)/bin/pythonw