diff options
author | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2001-01-24 17:13:11 (GMT) |
---|---|---|
committer | Neil Schemenauer <nascheme@enme.ucalgary.ca> | 2001-01-24 17:13:11 (GMT) |
commit | 6cf0702a79541eedbc87e4b3727db0d73f72e68d (patch) | |
tree | fb629a366a8612f42209731d5fac3d7c7ab9f54b /Modules/getpath.c | |
parent | 85515ad9795ffc3b676cbddeeea2b003818a2623 (diff) | |
download | cpython-6cf0702a79541eedbc87e4b3727db0d73f72e68d.zip cpython-6cf0702a79541eedbc87e4b3727db0d73f72e68d.tar.gz cpython-6cf0702a79541eedbc87e4b3727db0d73f72e68d.tar.bz2 |
Build now happens in toplevel directory, not Modules. Don't monkey with
VPATH.
Diffstat (limited to 'Modules/getpath.c')
-rw-r--r-- | Modules/getpath.c | 13 |
1 files changed, 1 insertions, 12 deletions
diff --git a/Modules/getpath.c b/Modules/getpath.c index aa5553d..c7567f7 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -270,21 +270,10 @@ search_for_prefix(char *argv0_path, char *home) strcpy(prefix, argv0_path); 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"). - */ + /* Check VPATH to see if argv0_path is in the build directory. */ 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); if (ismodule(prefix)) |