diff options
| author | Guido van Rossum <guido@python.org> | 1997-05-12 20:53:23 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-05-12 20:53:23 (GMT) |
| commit | d77636216c37c03173aba98135143d88d7184c68 (patch) | |
| tree | 394cf92485ea958f4b5f36169ae21a8e935bfe8e /Modules | |
| parent | 573a24a4f7e2bf22eddd4a12d8985a4f14b69b90 (diff) | |
| download | cpython-d77636216c37c03173aba98135143d88d7184c68.zip cpython-d77636216c37c03173aba98135143d88d7184c68.tar.gz cpython-d77636216c37c03173aba98135143d88d7184c68.tar.bz2 | |
Another change suggested by Donn Cave -- forget "step 5", which
searches /usr/local, /usr and /.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/getpath.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/Modules/getpath.c b/Modules/getpath.c index d888df2..fccd79f 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -106,9 +106,6 @@ PERFORMANCE OF THIS SOFTWARE. * PREFIX and EXEC_PREFIX. These are supplied by the Makefile but can be * passed in as options to the configure script. * - * Step 5. Search some `standard' directories, namely: /usr/local, /usr, - * then finally /. - * * That's it! * * Well, almost. Once we have determined prefix and exec_prefix, the @@ -153,8 +150,6 @@ PERFORMANCE OF THIS SOFTWARE. #define LANDMARK "string.py" #endif -static char *std_dirs[] = {"/usr/local/", "/usr/", "/", NULL}; - static char prefix[MAXPATHLEN+1]; static char exec_prefix[MAXPATHLEN+1]; static char *module_search_path = NULL; @@ -266,14 +261,7 @@ search_for_prefix(argv0_path, home) if (exists(prefix)) return 1; - /* Look at `standard' directories */ - for (i = 0; std_dirs[i]; i++) { - strcpy(prefix, std_dirs[i]); - join(prefix, lib_python); - join(prefix, LANDMARK); - if (exists(prefix)) - return 1; - } + /* Fail */ return 0; } @@ -326,14 +314,7 @@ search_for_exec_prefix(argv0_path, home) if (exists(exec_prefix)) return 1; - /* Look at `standard' directories */ - for (i = 0; std_dirs[i]; i++) { - strcpy(exec_prefix, std_dirs[i]); - join(exec_prefix, lib_python); - join(exec_prefix, "sharedmodules"); - if (exists(exec_prefix)) - return 1; - } + /* Fail */ return 0; } |