[Python-checkins] CVS: python/dist/src/Mac/OSX Makefile,1.8,1.9

[Jack Jansen]

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

Modified Files:
	Makefile 
Log Message:
Added target "installunixprograms" which installs python and pythonw in
/usr/local/bin (referring to the framework-based interpreter and Python.app).

Added target symlinkmacsubtree to aid in debugging.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** Makefile	27 Jan 2002 20:05:20 -0000	1.8
--- Makefile	29 Mar 2002 14:18:18 -0000	1.9
***************
*** 3,12 ****
--- 3,19 ----
  APPINSTALLDIR=/Applications/Python.app
  
+ # Variables for installing the "normal" unix binaries
+ UNIXBINDIR=/usr/local/bin
+ INSTALLED_PYTHON=$(INSTALLDIR)/bin/python
+ INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/python
+ 
  # Items more-or-less copied from the main Makefile
  DIRMODE=755
  INSTALL=/usr/bin/install -c
+ INSTALL_SYMLINK=/usr/bin/install -l as
  INSTALL_PROGRAM=${INSTALL}
  INSTALL_SCRIPT= ${INSTALL_PROGRAM}
  INSTALL_DATA=	${INSTALL} -m 644
+ STRIPFLAG=-s
  OPT=-g -O3 -Wall -Wstrict-prototypes -no-cpp-precomp -fno-common -dynamic
  INCLUDES=-I$(PYTHONBUILDDIR) -I$(PYTHONBUILDDIR)/Include \
***************
*** 72,76 ****
  		done; \
  	done
! 	$(INSTALL_PROGRAM) pythonforbundle $(APPINSTALLDIR)/Contents/MacOS/python
  	# Create a temporary version of the resources here
  	$(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/dialogs.rsrc dialogs.rsrc
--- 79,83 ----
  		done; \
  	done
! 	$(INSTALL_PROGRAM) $(STRIPFLAG) pythonforbundle $(APPINSTALLDIR)/Contents/MacOS/python
  	# Create a temporary version of the resources here
  	$(PYTHON) $(RFCONVERTER) -r $(RESOURCEDIR)/dialogs.rsrc dialogs.rsrc
***************
*** 180,183 ****
  
  	@echo '** Copy the contents of sample_sitecustomize.py (or similar code) into'
! 	@echo '**' $(INSTALLDIR)/lib/python2.2/sitecustomize.py
  	
--- 187,203 ----
  
  	@echo '** Copy the contents of sample_sitecustomize.py (or similar code) into'
! 	@echo '**' $(INSTALLDIR)/lib/python2.3/sitecustomize.py
! 	
! # Put symlinks "python" and "pythonw" in the standard place
! installunixprograms: $(INSTALLED_PYTHON) pythonw.sh
! 	$(INSTALL) -d $(UNIXBINDIR)
! 	$(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