Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Another change suggested by Donn Cave -- forget "step 5", which 

searches /usr/local, /usr and /.
This commit is contained in:
Guido van Rossum 1997-05-12 20:53:23 +00:00
parent 573a24a4f7
commit d77636216c
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
Modules/getpath.c
View File

@ -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;
}