[Python-checkins] python/dist/src Makefile.pre.in,1.95,1.96

[jackjansen@users.sourceforge.net]

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

Modified Files:
	Makefile.pre.in 
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.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.95
retrieving revision 1.96
diff -C2 -d -r1.95 -r1.96
*** Makefile.pre.in	6 Aug 2002 13:40:31 -0000	1.95
--- Makefile.pre.in	9 Aug 2002 00:18:21 -0000	1.96
***************
*** 771,774 ****
--- 771,782 ----
  		--install-platlib=$(DESTSHARED)
  
+ # Here are a couple of targets for MacOSX again, to install a full
+ # framework-based Python. frameworkinstall installs everything, the
+ # subtargets install specific parts. Much of the actual work is offloaded to
+ # the Makefile in Mac/OSX
+ #
+ frameworkinstall: frameworkinstallframework \
+ 	frameworkinstallapps frameworkinstallunixtools
+ 	
  # On install, we re-make the framework
  # structure in the install location, /Library/Frameworks/ or the argument to
***************
*** 777,783 ****
  # only have to cater for the structural bits of the framework.
  
! frameworkinstall: frameworkinfrastructureinstall install
! FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)
! frameworkinfrastructureinstall:	$(LDLIBRARY)
  	@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
  		echo Not configured with --enable-framework; \
--- 785,791 ----
  # only have to cater for the structural bits of the framework.
  
! frameworkinstallframework: frameworkinstallstructure install frameworkinstallmaclib
! 
! frameworkinstallstructure:	$(LDLIBRARY)
  	@if test "$(PYTHONFRAMEWORKDIR)" = no-framework; then \
  		echo Not configured with --enable-framework; \
***************
*** 785,789 ****
  	else true; \
  	fi
! 	@for i in $(FRAMEWORKFINALDEST)/Resources/English.lproj $(FRAMEWORKFINALDEST)/lib; do\
  		if test ! -d $$i; then \
  			echo "Creating directory $$i"; \
--- 793,797 ----
  	else true; \
  	fi
! 	@for i in $(prefix)/Resources/English.lproj $(prefix)/lib; do\
  		if test ! -d $$i; then \
  			echo "Creating directory $$i"; \
***************
*** 792,800 ****
  		fi; \
  	done
! 	$(LN) -fsn include/python$(VERSION) $(FRAMEWORKFINALDEST)/Headers
! 	$(INSTALL_DATA) $(RESSRCDIR)/Info.plist $(FRAMEWORKFINALDEST)/Resources/Info.plist
! 	$(INSTALL_DATA) $(RESSRCDIR)/version.plist $(FRAMEWORKFINALDEST)/Resources/version.plist
  	$(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
! 		$(FRAMEWORKFINALDEST)/Resources/English.lproj/InfoPlist.strings
  	$(LN) -fsn $(VERSION) $(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
  	$(LN) -fsn Versions/Current/Python $(PYTHONFRAMEWORKINSTALLDIR)/Python
--- 800,808 ----
  		fi; \
  	done
! 	$(LN) -fsn include/python$(VERSION) $(prefix)/Headers
! 	$(INSTALL_DATA) $(RESSRCDIR)/Info.plist $(prefix)/Resources/Info.plist
! 	$(INSTALL_DATA) $(RESSRCDIR)/version.plist $(prefix)/Resources/version.plist
  	$(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
! 		$(prefix)/Resources/English.lproj/InfoPlist.strings
  	$(LN) -fsn $(VERSION) $(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
  	$(LN) -fsn Versions/Current/Python $(PYTHONFRAMEWORKINSTALLDIR)/Python
***************
*** 803,811 ****
  	$(INSTALL_DATA) $(LDLIBRARY) $(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
  
! # Build Python executable that can run GUI code. Another MacOSX pseudo
! # target.
! osxapps:
! 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree install_all \
! 		srcdir=$(srcdir) builddir=.
  
  # Build the toplevel Makefile
--- 811,828 ----
  	$(INSTALL_DATA) $(LDLIBRARY) $(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
  
! # This installs Mac/Lib into the framework
! frameworkinstallmaclib:
! 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
! 		srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST)
! 
! # This installs the IDE, the Launcher and other apps into /Applications
! frameworkinstallapps:
! 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
! 		srcdir=$(srcdir) builddir=. dstroot=$(PYTHONFRAMEWORKPREFIX)/../..
! 
! # This install the unix python and pythonw tools in /usr/local/bin
! frameworkinstallunixtools:
! 	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installunixtools \
! 		srcdir=$(srcdir) builddir=. dstroot=$(PYTHONFRAMEWORKPREFIX)/../..
  
  # Build the toplevel Makefile