[Python-checkins] CVS: python/dist/src Makefile.in,1.110,1.111

[A.M. Kuchling]

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

Modified Files:
	Makefile.in 
Log Message:
Patch #103313: Fixes "make test" by adding a little file named
    "platform", running the Python binary to create it, and then
    using it to set PYTHONPATH.


Index: Makefile.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.in,v
retrieving revision 1.110
retrieving revision 1.111
diff -C2 -r1.110 -r1.111
*** Makefile.in	2001/01/18 16:10:56	1.110
--- Makefile.in	2001/01/18 21:20:56	1.111
***************
*** 156,159 ****
--- 156,162 ----
  		echo 0 >buildno
  
+ platform: python$(EXE)
+ 	./python$(EXE) -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
+ 
  # Build the shared modules
  sharedmods: 	python$(EXE)
***************
*** 216,223 ****
  TESTPROG=	$(srcdir)/Lib/test/regrtest.py
  TESTPYTHON=	./python$(EXE) -tt
! test:		all
  		-rm -f $(srcdir)/Lib/test/*.py[co]
! 		-PYTHONPATH= $(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
! 		PYTHONPATH= $(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
  
  # Install everything
--- 219,226 ----
  TESTPROG=	$(srcdir)/Lib/test/regrtest.py
  TESTPYTHON=	./python$(EXE) -tt
! test:		all platform
  		-rm -f $(srcdir)/Lib/test/*.py[co]
! 		-PYTHONPATH=$(srcdir)/build/lib.`cat platform` $(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
! 		PYTHONPATH=$(srcdir)/build/lib.`cat platform` $(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
  
  # Install everything
***************
*** 542,546 ****
  			SUBDIRS="$(SUBDIRSTOO)" clobber
  		-rm -f config.status config.log config.cache config.h Makefile
! 		-rm -f buildno
  		-rm -f Modules/Makefile
  		-for i in $(SUBDIRS) $(SUBDIRSTOO); do \
--- 545,549 ----
  			SUBDIRS="$(SUBDIRSTOO)" clobber
  		-rm -f config.status config.log config.cache config.h Makefile
! 		-rm -f buildno platform
  		-rm -f Modules/Makefile
  		-for i in $(SUBDIRS) $(SUBDIRSTOO); do \