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

[jackjansen@users.sourceforge.net]

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

Modified Files:
	Makefile.pre.in 
Log Message:
In the altbininstall target, which is the first subtarget for "make install",
if we are running in an OSX framework enabled build directory, test that
the framework infrastructure exists. This catches the very common
error of doing "make install" in stead of "make frameworkinstall".


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.94
retrieving revision 1.95
diff -C2 -d -r1.94 -r1.95
*** Makefile.pre.in	4 Aug 2002 21:17:20 -0000	1.94
--- Makefile.pre.in	6 Aug 2002 13:40:31 -0000	1.95
***************
*** 570,573 ****
--- 570,579 ----
  # This goes into $(exec_prefix)
  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; \
+ 		fi; \
+ 	fi
  	@for i in $(BINDIR) $(LIBDIR); \
  	do \
***************
*** 771,775 ****
  # only have to cater for the structural bits of the framework.
  
! frameworkinstall: install frameworkinfrastructureinstall
  FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)
  frameworkinfrastructureinstall:	$(LDLIBRARY)
--- 777,781 ----
  # only have to cater for the structural bits of the framework.
  
! frameworkinstall: frameworkinfrastructureinstall install
  FRAMEWORKFINALDEST=$(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)
  frameworkinfrastructureinstall:	$(LDLIBRARY)