[Python-checkins] python/dist/src Makefile.pre.in,1.127,1.128

[jackjansen@users.sourceforge.net]

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

Modified Files:
	Makefile.pre.in 
Log Message:
Fixed the DESTDIR modifications to also allow MacOSX framework builds
to be installed to a different location. This should make the OSX binary
installer building a lot simpler.


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.127
retrieving revision 1.128
diff -C2 -d -r1.127 -r1.128
*** Makefile.pre.in	16 May 2003 05:40:31 -0000	1.127
--- Makefile.pre.in	25 May 2003 22:01:31 -0000	1.128
***************
*** 591,595 ****
  altbininstall:	$(BUILDPYTHON)
  	@if test "$(PYTHONFRAMEWORKDIR)" != no-framework; then \
! 		if test ! -f $(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current/Resources/Info.plist; then \
  			echo 'Framework build: use "make frameworkinstall" in stead of "make install"'; \
  			exit 1; \
--- 591,595 ----
  altbininstall:	$(BUILDPYTHON)
  	@if test "$(PYTHONFRAMEWORKDIR)" != no-framework; then \
! 		if test ! -f $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current/Resources/Info.plist; then \
  			echo 'Framework build: use "make frameworkinstall" in stead of "make install"'; \
  			exit 1; \
***************
*** 836,854 ****
  	@for i in $(prefix)/Resources/English.lproj $(prefix)/lib; do\
  		if test ! -d $(DESTDIR)$$i; then \
! 			echo "Creating directory $$i"; \
! 			$(INSTALL) -d -m $(DIRMODE) $$i; \
  		else	true; \
  		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
! 	$(LN) -fsn Versions/Current/Headers $(PYTHONFRAMEWORKINSTALLDIR)/Headers
! 	$(LN) -fsn Versions/Current/Resources $(PYTHONFRAMEWORKINSTALLDIR)/Resources
! 	$(INSTALL_DATA) $(LDLIBRARY) $(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
  
  # This installs Mac/Lib into the framework
--- 836,854 ----
  	@for i in $(prefix)/Resources/English.lproj $(prefix)/lib; do\
  		if test ! -d $(DESTDIR)$$i; then \
! 			echo "Creating directory $(DESTDIR)$$i"; \
! 			$(INSTALL) -d -m $(DIRMODE) $(DESTDIR)$$i; \
  		else	true; \
  		fi; \
  	done
! 	$(LN) -fsn include/python$(VERSION) $(DESTDIR)$(prefix)/Headers
! 	$(INSTALL_DATA) $(RESSRCDIR)/Info.plist $(DESTDIR)$(prefix)/Resources/Info.plist
! 	$(INSTALL_DATA) $(RESSRCDIR)/version.plist $(DESTDIR)$(prefix)/Resources/version.plist
  	$(INSTALL_DATA) $(RESSRCDIR)/English.lproj/InfoPlist.strings \
! 		$(DESTDIR)$(prefix)/Resources/English.lproj/InfoPlist.strings
! 	$(LN) -fsn $(VERSION) $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Versions/Current
! 	$(LN) -fsn Versions/Current/Python $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Python
! 	$(LN) -fsn Versions/Current/Headers $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Headers
! 	$(LN) -fsn Versions/Current/Resources $(DESTDIR)$(PYTHONFRAMEWORKINSTALLDIR)/Resources
! 	$(INSTALL_DATA) $(LDLIBRARY) $(DESTDIR)$(PYTHONFRAMEWORKPREFIX)/$(LDLIBRARY)
  
  # This installs Mac/Lib into the framework
***************
*** 856,860 ****
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
  		BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
! 		srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST)
  
  # This installs the IDE, the Launcher and other apps into /Applications
--- 856,861 ----
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installmacsubtree \
  		BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
! 		srcdir=$(srcdir) builddir=. prefix=$(prefix) LIBDEST=$(LIBDEST) \
! 		DESTDIR=$(DESTDIR)
  
  # This installs the IDE, the Launcher and other apps into /Applications
***************
*** 862,866 ****
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
  		BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
! 		srcdir=$(srcdir) builddir=. dstroot=$(PYTHONFRAMEWORKPREFIX)/../..
  
  # This install the unix python and pythonw tools in /usr/local/bin
--- 863,867 ----
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installapps \
  		BUILDPYTHON=./$(BUILDPYTHON) DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
! 		srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
  
  # This install the unix python and pythonw tools in /usr/local/bin
***************
*** 868,872 ****
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installunixtools \
  		DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
! 		srcdir=$(srcdir) builddir=. dstroot=$(PYTHONFRAMEWORKPREFIX)/../..
  
  # This installs IDLE
--- 869,873 ----
  	$(MAKE) -f $(srcdir)/Mac/OSX/Makefile installunixtools \
  		DIRMODE=$(DIRMODE) FILEMODE=$(FILEMODE) \
! 		srcdir=$(srcdir) builddir=. DESTDIR=$(DESTDIR)
  
  # This installs IDLE