[Python-checkins] python/dist/src/Mac/OSX Makefile,1.36,1.37

[jackjansen@users.sourceforge.net]

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

Modified Files:
	Makefile 
Log Message:
In Mac OS X framework builds don't assume that the executable will be
called python.exe but actually pass it from the main Makefile to
Mac/OSX/Makefile. This makes framework builds work again on case
sensitive filesystems. Fixes bug #677753.



Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.36
retrieving revision 1.37
diff -C2 -d -r1.36 -r1.37
*** Makefile	24 Feb 2003 16:30:24 -0000	1.36
--- Makefile	25 Feb 2003 12:41:10 -0000	1.37
***************
*** 9,12 ****
--- 9,13 ----
  prefix=$(dstroot)/Library/Frameworks/Python.framework/Versions/$(VERSION)
  LIBDEST=$(prefix)/lib/python$(VERSION)
+ BUILDPYTHON=$(builddir)/python.exe
  
  # These are normally glimpsed from the previous set
***************
*** 42,46 ****
  CPMAC=/Developer/Tools/CpMac
  
- PYTHON=$(builddir)/python.exe
  APPTEMPLATE=$(srcdir)/Mac/OSXResources/app
  APPSUBDIRS=MacOS Resources Resources/English.lproj
--- 43,46 ----
***************
*** 57,61 ****
  		DSTROOT=$(dstroot) INSTALL_PATH=$(PYTHONAPPSPATH) install
  	
! install_Python: $(PYTHON)
  	@for i in $(PYTHONAPPSDIR) $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
  		if test ! -d $$i; then \
--- 57,61 ----
  		DSTROOT=$(dstroot) INSTALL_PATH=$(PYTHONAPPSPATH) install
  	
! install_Python:
  	@for i in $(PYTHONAPPSDIR) $(APPINSTALLDIR) $(APPINSTALLDIR)/Contents; do \
  		if test ! -d $$i; then \
***************
*** 95,99 ****
  		done; \
  	done
! 	$(INSTALL_PROGRAM) $(STRIPFLAG) $(PYTHON) $(APPINSTALLDIR)/Contents/MacOS/python
  # Finally create the documentation symlink
  	$(LN) -fsn ../../../../English.lproj/Documentation $(APPINSTALLDIR)/Contents/Resources/English.lproj/Documentation
--- 95,99 ----
  		done; \
  	done
! 	$(INSTALL_PROGRAM) $(STRIPFLAG) $(BUILDPYTHON) $(APPINSTALLDIR)/Contents/MacOS/python
  # Finally create the documentation symlink
  	$(LN) -fsn ../../../../English.lproj/Documentation $(APPINSTALLDIR)/Contents/Resources/English.lproj/Documentation
***************
*** 208,214 ****
  	$(INSTALL_DATA) $(PTHFILE) $(LIBDEST)/site-packages/
  
! 	$(PYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST)
! 	$(PYTHON) -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
! 	$(PYTHON) -O -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
  
  #
--- 208,214 ----
  	$(INSTALL_DATA) $(PTHFILE) $(LIBDEST)/site-packages/
  
! 	$(BUILDPYTHON) $(CACHERSRC) -v $(MACLIBDEST) $(MACTOOLSDEST)
! 	$(BUILDPYTHON) -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
! 	$(BUILDPYTHON) -O -Wi -tt $(compileall) -x badsyntax $(MACTOOLSDEST)
  
  #