[Python-checkins] python/dist/src/Lib/distutils sysconfig.py,1.49,1.50

mwh@users.sourceforge.net mwh@users.sourceforge.net
Fri, 12 Jul 2002 02:16:46 -0700


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

Modified Files:
	sysconfig.py 
Log Message:
Well, Fred never did explain why the code to determine whether the
calling Python was installed was so complicated, so I simplified it.

This should get the snake-farm's build scripts working again.


Index: sysconfig.py
===================================================================
RCS file: /cvsroot/python/python/dist/src/Lib/distutils/sysconfig.py,v
retrieving revision 1.49
retrieving revision 1.50
diff -C2 -d -r1.49 -r1.50
*** sysconfig.py	26 Jun 2002 22:05:33 -0000	1.49
--- sysconfig.py	12 Jul 2002 09:16:44 -0000	1.50
***************
*** 30,40 ****
  argv0_path = os.path.dirname(os.path.abspath(sys.executable))
  landmark = os.path.join(argv0_path, "Modules", "Setup")
! if not os.path.isfile(landmark):
!     python_build = 0
! elif os.path.isfile(os.path.join(argv0_path, "Lib", "os.py")):
!     python_build = 1
! else:
!     python_build = os.path.isfile(os.path.join(os.path.dirname(argv0_path),
!                                                "Lib", "os.py"))
  del argv0_path, landmark
  
--- 30,36 ----
  argv0_path = os.path.dirname(os.path.abspath(sys.executable))
  landmark = os.path.join(argv0_path, "Modules", "Setup")
! 
! python_build = os.path.isfile(landmark)
! 
  del argv0_path, landmark