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

VPATH.

diff --git a/Modules/getpath.c b/Modules/getpath.c
index aa5553debae9d7e73d3f66688b5491587794fd85..c7567f7579533ddbfb693c8437300e8aacbb988a 100644 (file)
--- 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))