[Python-checkins] CVS: python/dist/src Makefile.pre.in,1.43,1.44

[Neil Schemenauer]

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

Modified Files:
	Makefile.pre.in 
Log Message:
Add -E command line switch (ignore environment variables like PYTHONHOME
and PYTHONPATH).


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.43
retrieving revision 1.44
diff -C2 -d -r1.43 -r1.44
*** Makefile.pre.in	2001/07/19 15:17:52	1.43
--- Makefile.pre.in	2001/07/23 16:30:26	1.44
***************
*** 282,291 ****
  
  platform: $(PYTHON)
! 	./$(PYTHON) -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
  
  
  # Build the shared modules
  sharedmods: $(PYTHON)
! 	PYTHONPATH= ./$(PYTHON) $(srcdir)/setup.py build
  
  # buildno should really depend on something like LIBRARY_SRC
--- 282,291 ----
  
  platform: $(PYTHON)
! 	./$(PYTHON) -E -c 'import sys ; from distutils.util import get_platform ; print get_platform()+"-"+sys.version[0:3]' >platform
  
  
  # Build the shared modules
  sharedmods: $(PYTHON)
! 	./$(PYTHON) -E $(srcdir)/setup.py build
  
  # buildno should really depend on something like LIBRARY_SRC
***************
*** 467,475 ****
  TESTOPTS=	-l
  TESTPROG=	$(srcdir)/Lib/test/regrtest.py
! TESTPYTHON=	./$(PYTHON) -tt
  test:		all platform
  		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
! 		-PYTHONPATH= $(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
! 		PYTHONPATH= $(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
  
  QUICKTESTOPTS=	$(TESTOPTS) -x test_thread test_signal test_strftime \
--- 467,475 ----
  TESTOPTS=	-l
  TESTPROG=	$(srcdir)/Lib/test/regrtest.py
! TESTPYTHON=	./$(PYTHON) -E -tt
  test:		all platform
  		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
! 		-$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
! 		$(TESTPYTHON) $(TESTPROG) $(TESTOPTS)
  
  QUICKTESTOPTS=	$(TESTOPTS) -x test_thread test_signal test_strftime \
***************
*** 478,483 ****
  quicktest:	all platform
  		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
! 		-PYTHONPATH= $(TESTPYTHON) $(TESTPROG) $(QUICKTESTOPTS)
! 		PYTHONPATH= $(TESTPYTHON) $(TESTPROG) $(QUICKTESTOPTS)
  
  MEMTESTOPTS=    $(QUICKTESTOPTS) -x test_dl test___all__ test_fork1 \
--- 478,483 ----
  quicktest:	all platform
  		-find $(srcdir)/Lib -name '*.py[co]' -print | xargs rm -f
! 		-$(TESTPYTHON) $(TESTPROG) $(QUICKTESTOPTS)
! 		$(TESTPYTHON) $(TESTPROG) $(QUICKTESTOPTS)
  
  MEMTESTOPTS=    $(QUICKTESTOPTS) -x test_dl test___all__ test_fork1 \
***************
*** 485,490 ****
  memtest:	all platform
  		-rm -f $(srcdir)/Lib/test/*.py[co]
! 		-PYTHONPATH= $(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
! 		PYTHONPATH= $(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
  
  # Install everything
--- 485,490 ----
  memtest:	all platform
  		-rm -f $(srcdir)/Lib/test/*.py[co]
! 		-$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
! 		$(TESTPYTHON) $(TESTPROG) $(MEMTESTOPTS)
  
  # Install everything
***************
*** 709,713 ****
  # This goes into $(exec_prefix)
  sharedinstall:
! 	PYTHONPATH= ./$(PYTHON) $(srcdir)/setup.py install \
  		--install-platlib=$(DESTSHARED)
  
--- 709,713 ----
  # This goes into $(exec_prefix)
  sharedinstall:
! 	./$(PYTHON) -E $(srcdir)/setup.py install \
  		--install-platlib=$(DESTSHARED)