[Python-checkins] python/dist/src/Mac/OSX Makefile,1.19,1.20

[jackjansen@users.sourceforge.net]

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

Modified Files:
	Makefile 
Log Message:
By popular demand the frameworkinstall target now installs everything:
the framework, the MacOSX apps and the unix tools.
Most of the hard work is done by Mac/OSX/Makefile.

Also, it should now be possible to install in a different directory,
such as /tmp/dist/Library/Frameworks, for building binary installers.
The fink crowd wanted this.


Index: Makefile
===================================================================
RCS file: /cvsroot/python/python/dist/src/Mac/OSX/Makefile,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** Makefile	2 Aug 2002 21:46:40 -0000	1.19
--- Makefile	9 Aug 2002 00:18:21 -0000	1.20
***************
*** 1,17 ****
! # This file can be invoked from the "python.app" target in the 
! # main Makefile. The next two variables are overridden on the 
  # commandline in that case.
  
! # assume user was invoking from Mac/OSX directory and building in source tree
  builddir = ../..
  srcdir = ../..
! VERSION=2.3
! 
  prefix=/Library/Frameworks/Python.framework/Versions/$(VERSION)
! PYTHONAPPSDIR=/Applications/Python
  APPINSTALLDIR=$(prefix)/Resources/Python.app
  
  # Variables for installing the "normal" unix binaries
- UNIXBINDIR=/usr/local/bin
  INSTALLED_PYTHON=$(prefix)/bin/python
  INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/python
--- 1,19 ----
! # This file can be invoked from the various frameworkinstall... targets in the 
! # main Makefile. The next couple of variables are overridden on the 
  # commandline in that case.
  
! VERSION=2.3
  builddir = ../..
  srcdir = ../..
! LIBDEST=$(prefix)/lib/python$(VERSION)
  prefix=/Library/Frameworks/Python.framework/Versions/$(VERSION)
! dstroot=/.
! 
! # These are normally glimpsed from the previous set
! bindir=$(dstroot)/usr/local/bin
! PYTHONAPPSDIR=$(dstroot)/Applications/Python
  APPINSTALLDIR=$(prefix)/Resources/Python.app
  
  # Variables for installing the "normal" unix binaries
  INSTALLED_PYTHON=$(prefix)/bin/python
  INSTALLED_PYTHONW=$(APPINSTALLDIR)/Contents/MacOS/python
***************
*** 28,32 ****
  	-fno-common -dynamic
  INCLUDES=-I$(builddir) -I$(srcdir)/Include -I$(srcdir)/Mac/Include
! DEFINES=-DHAVE_CONFIG_H
  
  CFLAGS=$(OPT) $(DEFINES) $(INCLUDES)
--- 30,34 ----
  	-fno-common -dynamic
  INCLUDES=-I$(builddir) -I$(srcdir)/Include -I$(srcdir)/Mac/Include
! DEFINES=
  
  CFLAGS=$(OPT) $(DEFINES) $(INCLUDES)
***************
*** 45,53 ****
  RFCONVERTER=$(srcdir)/Mac/Lib/applesingle.py
  
! install_all: install_PythonLauncher install_Python install_BuildApplet install_IDE
  
  install_PythonLauncher:
  	cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
! 	pbxbuild -target PythonLauncher -buildstyle Deployment DSTROOT=/ install
  	
  install_Python: $(PYTHON)
--- 47,55 ----
  RFCONVERTER=$(srcdir)/Mac/Lib/applesingle.py
  
! installapps: install_PythonLauncher install_Python install_BuildApplet install_IDE
  
  install_PythonLauncher:
  	cd $(srcdir)/Mac/OSX/PythonLauncher/PythonLauncher.pbproj ; \
! 	pbxbuild -target PythonLauncher -buildstyle Deployment DSTROOT=$(dstroot) install
  	
  install_Python: $(PYTHON)
***************
*** 222,235 ****
  	done
  
! 	$(INSTALL_DATA) $(srcdir)/Mac/OSX/Mac.pth $(prefix)/lib/python$(VERSION)/site-packages/
  	
  # Put symlinks "python" and "pythonw" in the standard place
  $(INSTALLED_PYTHONW): install_Python
  # $(INSTALLED_PYTHON) has to be done by the main Makefile, we cannot do that here.
  
! installunixprograms: $(INSTALLED_PYTHON) $(INSTALLED_PYTHONW) pythonw.sh
! 	$(INSTALL) -d $(UNIXBINDIR)
! 	$(INSTALL_SYMLINK) $(INSTALLED_PYTHON) $(UNIXBINDIR)/python
! 	$(INSTALL) pythonw.sh $(UNIXBINDIR)/pythonw
  	
  # This is for development purposes: create a Mac.pth that refers to the source
--- 224,239 ----
  	done
  
! 	$(INSTALL_DATA) $(srcdir)/Mac/OSX/Mac.pth $(LIBDEST)/site-packages/
  	
  # Put symlinks "python" and "pythonw" in the standard place
  $(INSTALLED_PYTHONW): install_Python
+ 
  # $(INSTALLED_PYTHON) has to be done by the main Makefile, we cannot do that here.
+ # At least this rule will give an error if it doesn't exist.
  
! installunixtools: $(INSTALLED_PYTHON) $(INSTALLED_PYTHONW) $(srcdir)/Mac/OSX/pythonw.sh
! 	$(INSTALL) -d $(bindir)
! 	$(INSTALL_SYMLINK) $(INSTALLED_PYTHON) $(bindir)/python
! 	$(INSTALL) $(srcdir)/Mac/OSX/pythonw.sh $(bindir)/pythonw
  	
  # This is for development purposes: create a Mac.pth that refers to the source
***************
*** 237,240 ****
  dontinstallmacsubtree:
  	l=`cd $(srcdir)/Mac/Lib; pwd`; \
! 	echo $$l > $(prefix)/lib/python$(VERSION)/site-packages/Mac.pth ; \
! 	echo $$l/lib-scriptpackages >> $(prefix)/lib/python$(VERSION)/site-packages/Mac.pth
--- 241,244 ----
  dontinstallmacsubtree:
  	l=`cd $(srcdir)/Mac/Lib; pwd`; \
! 	echo $$l > $(LIBDEST)/site-packages/Mac.pth ; \
! 	echo $$l/lib-scriptpackages >> $(LIBDEST)/site-packages/Mac.pth