[Python-checkins] python/dist/src/Mac/OSX Makefile,1.12,1.13

jackjansen@users.sourceforge.net jackjansen@users.sourceforge.net
Mon, 08 Jul 2002 06:34:26 -0700


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

Modified Files:
	Makefile 
Log Message:
Got rid of symlink target, and in stead have "make dontinstallmacsubtree"
which uses a .pth file to add the Mac/Lib from your source tree to sys.path.

Also put the Python version number in a variable.Killed by signal 2.



Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** Makefile	21 Jun 2002 14:48:38 -0000	1.12
--- Makefile	8 Jul 2002 13:34:23 -0000	1.13
***************
*** 16,19 ****
--- 16,20 ----
  
  # Items more-or-less copied from the main Makefile
+ VERSION=2.3
  DIRMODE=755
  INSTALL=/usr/bin/install -c
***************
*** 205,209 ****
  	done
  
! 	$(INSTALL_DATA) $(PYTHONSRCDIR)/Mac/OSX/Mac.pth $(INSTALLDIR)/lib/python2.3/site-packages/
  	
  # Put symlinks "python" and "pythonw" in the standard place
--- 206,210 ----
  	done
  
! 	$(INSTALL_DATA) $(PYTHONSRCDIR)/Mac/OSX/Mac.pth $(INSTALLDIR)/lib/python$(VERSION)/site-packages/
  	
  # Put symlinks "python" and "pythonw" in the standard place
***************
*** 213,223 ****
  	$(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
  
  
--- 214,223 ----
  	$(INSTALL) pythonw.sh $(UNIXBINDIR)/pythonw
  	
! # This is for development purposes: create a Mac.pth that refers to the source
! # directories
! dontinstallmacsubtree:
! 	l=`cd $(PYTHONSRCDIR)/Mac/Lib; pwd`; \
! 	echo $$l > $(INSTALLDIR)/lib/python$(VERSION)/site-packages/Mac.pth ; \
! 	echo $$l/lib-scriptpackages >> $(INSTALLDIR)/lib/python$(VERSION)/site-packages/Mac.pth