Commit 6cf0702a authored by Neil Schemenauer's avatar Neil Schemenauer

Build now happens in toplevel directory, not Modules. Don't monkey with

VPATH.
parent 85515ad9
......@@ -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))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment