[Python-checkins] CVS: python/dist/src/Modules getpath.c,1.34,1.35

[Neil Schemenauer]

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

Modified Files:
	getpath.c 
Log Message:
Build now happens in toplevel directory, not Modules.  Don't monkey with
VPATH.


Index: getpath.c
===================================================================
RCS file: /cvsroot/python/python/dist/src/Modules/getpath.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** getpath.c	2001/01/23 01:57:40	1.34
--- getpath.c	2001/01/24 17:13:11	1.35
***************
*** 271,289 ****
      joinpath(prefix, "Modules/Setup");
      if (isfile(prefix)) {
!         /* Check VPATH to see if argv0_path is in the build directory.
!          * Complication: the VPATH passed in is relative to the
!          * Modules build directory and points to the Modules source
!          * directory; we need it relative to the build tree and
!          * pointing to the source tree.  Solution: chop off a leading
!          * ".." (but only if it's there -- it could be an absolute
!          * path) and chop off the final component (assuming it's
!          * "Modules").
!          */
          vpath = VPATH;
-         if (vpath[0] == '.' && vpath[1] == '.' && vpath[2] == '/')
-             vpath += 3;
          strcpy(prefix, argv0_path);
          joinpath(prefix, vpath);
-         reduce(prefix);
          joinpath(prefix, "Lib");
          joinpath(prefix, LANDMARK);
--- 271,278 ----
      joinpath(prefix, "Modules/Setup");
      if (isfile(prefix)) {
!         /* Check VPATH to see if argv0_path is in the build directory. */
          vpath = VPATH;
          strcpy(prefix, argv0_path);
          joinpath(prefix, vpath);
          joinpath(prefix, "Lib");
          joinpath(prefix, LANDMARK);