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

[A.M. Kuchling]

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

Modified Files:
	Makefile.pre.in 
Log Message:
Set PYTHONPATH when running setup.py in order to override any ambient
    value for it, as suggested in bug #129854.  This prevents an old
    PYTHONPATH confusing setup.py (say, if it results in Python finding
    an old version of the Distutils)


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** Makefile.pre.in	2001/02/16 04:16:34	1.19
--- Makefile.pre.in	2001/02/17 05:33:50	1.20
***************
*** 282,286 ****
  # Build the shared modules
  sharedmods: $(PYTHON)
! 	./$(PYTHON) $(srcdir)/setup.py build
  
  # buildno should really depend on something like LIBRARY_SRC
--- 282,286 ----
  # Build the shared modules
  sharedmods: $(PYTHON)
! 	PYTHONPATH= ./$(PYTHON) $(srcdir)/setup.py build
  
  # buildno should really depend on something like LIBRARY_SRC
***************
*** 690,694 ****
  # This goes into $(exec_prefix)
  sharedinstall:
! 	./python$(EXEEXT) $(srcdir)/setup.py install \
  		--install-platlib=$(DESTSHARED)
  
--- 690,694 ----
  # This goes into $(exec_prefix)
  sharedinstall:
! 	PYTHONPATH= ./python$(EXEEXT) $(srcdir)/setup.py install \
  		--install-platlib=$(DESTSHARED)