[Python-checkins] python/dist/src/Mac/OSX Makefile,1.29,1.30 Makefile.jaguar,1.1,1.2

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src/Mac/OSX
In directory sc8-pr-cvs1:/tmp/cvs-serv22633

Modified Files:
	Makefile Makefile.jaguar 
Log Message:
Build PythonLauncher for MacPython-OSX 2.2 as well.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** Makefile	11 Nov 2002 00:05:00 -0000	1.29
--- Makefile	20 Nov 2002 14:06:16 -0000	1.30
***************
*** 12,16 ****
  # These are normally glimpsed from the previous set
  bindir=$(dstroot)/usr/local/bin
! PYTHONAPPSDIR=$(dstroot)/Applications/Python
  APPINSTALLDIR=$(prefix)/Resources/Python.app
  PTHFILE=$(srcdir)/Mac/OSX/Mac.pth
--- 12,17 ----
  # These are normally glimpsed from the previous set
  bindir=$(dstroot)/usr/local/bin
! PYTHONAPPSPATH=/Applications/Python
! PYTHONAPPSDIR=$(dstroot)$(PYTHONAPPSPATH)
  APPINSTALLDIR=$(prefix)/Resources/Python.app
  PTHFILE=$(srcdir)/Mac/OSX/Mac.pth
***************
*** 51,55 ****
  install_PythonLauncher:
  	cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
! 	pbxbuild -target PythonLauncher -buildstyle Deployment DSTROOT=$(dstroot) install
  	
  install_Python: $(PYTHON)
--- 52,57 ----
  install_PythonLauncher:
  	cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
! 	pbxbuild -target PythonLauncher -buildstyle Deployment \
! 		DSTROOT=$(dstroot) INSTALL_PATH=$(PYTHONAPPSPATH) install
  	
  install_Python: $(PYTHON)

Index: Makefile.jaguar
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile.jaguar,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** Makefile.jaguar	15 Nov 2002 00:13:32 -0000	1.1
--- Makefile.jaguar	20 Nov 2002 14:06:16 -0000	1.2
***************
*** 7,11 ****
  srcdir = ../..
  dstroot=/.
! PYTHONAPPSDIR=$(dstroot)/Applications/MacPython-OSX
  prefix=/usr
  
--- 7,12 ----
  srcdir = ../..
  dstroot=/.
! PYTHONAPPSPATH=/Applications/MacPython-OSX
! PYTHONAPPSDIR=$(dstroot)$(PYTHONAPPSPATH)
  prefix=/usr
  
***************
*** 30,36 ****
  INSTALL_DATA=	${INSTALL} -m 644
  
! install: install_dirs install_dynlib install_lib \
  	install_Python install_IDE install_IDLE install_BuildApplet \
! 	install_pythonw 
  	
  install_dirs:
--- 31,48 ----
  INSTALL_DATA=	${INSTALL} -m 644
  
! # 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_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:
***************
*** 76,80 ****
--- 88,101 ----
  		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