mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-12-04 08:34:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Change sharedmodules to lib-dynload.

Browse source 
### If you still have sharedmodules in your Modules/Setup file, remove it! ###
This commit is contained in:
Guido van Rossum 1997-10-20 23:20:32 +00:00
parent 7eecc246a7
commit 266033e89b
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Modules/Makefile.pre.in
View file

@ -59,7 +59,7 @@ SO= @SO@
LDSHARED= @LDSHARED@ LDSHARED= @LDSHARED@
CCSHARED= @CCSHARED@ CCSHARED= @CCSHARED@
LINKFORSHARED= @LINKFORSHARED@ LINKFORSHARED= @LINKFORSHARED@
DESTSHARED= $(BINLIBDEST)/sharedmodules DESTSHARED= $(BINLIBDEST)/lib-dynload
# Portable install script (configure doesn't always guess right) # Portable install script (configure doesn't always guess right)
INSTALL= @srcdir@/../install-sh -c INSTALL= @srcdir@/../install-sh -c

12
Modules/getpath.c
View file

@ -84,7 +84,7 @@ PERFORMANCE OF THIS SOFTWARE.
* *
* For the remaining steps, the prefix landmark will always be * For the remaining steps, the prefix landmark will always be
* lib/python$VERSION/string.py and the exec_prefix will always be * lib/python$VERSION/string.py and the exec_prefix will always be
* lib/python$VERSION/sharedmodules, where $VERSION is Python's version * lib/python$VERSION/lib-dynload, where $VERSION is Python's version
* number as supplied by the Makefile. Note that this means that no more * number as supplied by the Makefile. Note that this means that no more
* build directory checking is performed; if the first step did not find * build directory checking is performed; if the first step did not find
* the landmarks, the assumption is that python is running from an * the landmarks, the assumption is that python is running from an
@ -143,7 +143,7 @@ PERFORMANCE OF THIS SOFTWARE.
/* I know this isn't K&R C, but the Makefile specifies it anyway */ /* I know this isn't K&R C, but the Makefile specifies it anyway */
#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ #define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
PREFIX "/lib/python" VERSION "/test" ":" \ PREFIX "/lib/python" VERSION "/test" ":" \
EXEC_PREFIX "/lib/python" VERSION "/sharedmodules" EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
#endif #endif
#ifndef LANDMARK #ifndef LANDMARK
@ -291,7 +291,7 @@ search_for_exec_prefix(argv0_path, home)
else else
strcpy(exec_prefix, home); strcpy(exec_prefix, home);
joinpath(exec_prefix, lib_python); joinpath(exec_prefix, lib_python);
joinpath(exec_prefix, "sharedmodules"); joinpath(exec_prefix, "lib-dynload");
if (exists(exec_prefix)) if (exists(exec_prefix))
return 1; return 1;
} }
@ -301,7 +301,7 @@ search_for_exec_prefix(argv0_path, home)
do { do {
n = strlen(exec_prefix); n = strlen(exec_prefix);
joinpath(exec_prefix, lib_python); joinpath(exec_prefix, lib_python);
joinpath(exec_prefix, "sharedmodules"); joinpath(exec_prefix, "lib-dynload");
if (exists(exec_prefix)) if (exists(exec_prefix))
return 1; return 1;
exec_prefix[n] = '\0'; exec_prefix[n] = '\0';
@ -311,7 +311,7 @@ search_for_exec_prefix(argv0_path, home)
/* Look at configure's EXEC_PREFIX */ /* Look at configure's EXEC_PREFIX */
strcpy(exec_prefix, EXEC_PREFIX); strcpy(exec_prefix, EXEC_PREFIX);
joinpath(exec_prefix, lib_python); joinpath(exec_prefix, lib_python);
joinpath(exec_prefix, "sharedmodules"); joinpath(exec_prefix, "lib-dynload");
if (exists(exec_prefix)) if (exists(exec_prefix))
return 1; return 1;
@ -410,7 +410,7 @@ calculate_path()
fprintf(stderr, fprintf(stderr,
"Could not find platform dependent libraries <exec_prefix>\n"); "Could not find platform dependent libraries <exec_prefix>\n");
strcpy(exec_prefix, EXEC_PREFIX); strcpy(exec_prefix, EXEC_PREFIX);
joinpath(exec_prefix, "lib/sharedmodules"); joinpath(exec_prefix, "lib/lib-dynload");
} }
/* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */ /* If we found EXEC_PREFIX do *not* reduce it! (Yet.) */