diff options
| author | Guido van Rossum <guido@python.org> | 1997-10-20 23:20:32 (GMT) |
|---|---|---|
| committer | Guido van Rossum <guido@python.org> | 1997-10-20 23:20:32 (GMT) |
| commit | 266033e89b52b1ed6264cb0dc3aacd4ab185ed23 (patch) | |
| tree | acd912d87fd904443e9f768808ccfa9ff4102fb9 | |
| parent | 7eecc246a7632d3e39db3a648f5934715301886b (diff) | |
| download | cpython-266033e89b52b1ed6264cb0dc3aacd4ab185ed23.zip cpython-266033e89b52b1ed6264cb0dc3aacd4ab185ed23.tar.gz cpython-266033e89b52b1ed6264cb0dc3aacd4ab185ed23.tar.bz2 | |
Change sharedmodules to lib-dynload.
### If you still have sharedmodules in your Modules/Setup file, remove it! ###
| -rw-r--r-- | Modules/Makefile.pre.in | 2 | ||||
| -rw-r--r-- | Modules/getpath.c | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/Modules/Makefile.pre.in b/Modules/Makefile.pre.in index b704448..ba2341a 100644 --- a/Modules/Makefile.pre.in +++ b/Modules/Makefile.pre.in @@ -59,7 +59,7 @@ SO= @SO@ LDSHARED= @LDSHARED@ CCSHARED= @CCSHARED@ LINKFORSHARED= @LINKFORSHARED@ -DESTSHARED= $(BINLIBDEST)/sharedmodules +DESTSHARED= $(BINLIBDEST)/lib-dynload # Portable install script (configure doesn't always guess right) INSTALL= @srcdir@/../install-sh -c diff --git a/Modules/getpath.c b/Modules/getpath.c index cc275cf..a44b74e 100644 --- a/Modules/getpath.c +++ b/Modules/getpath.c @@ -84,7 +84,7 @@ PERFORMANCE OF THIS SOFTWARE. * * 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/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 * build directory checking is performed; if the first step did not find * 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 */ #define PYTHONPATH PREFIX "/lib/python" VERSION ":" \ PREFIX "/lib/python" VERSION "/test" ":" \ - EXEC_PREFIX "/lib/python" VERSION "/sharedmodules" + EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" #endif #ifndef LANDMARK @@ -291,7 +291,7 @@ search_for_exec_prefix(argv0_path, home) else strcpy(exec_prefix, home); joinpath(exec_prefix, lib_python); - joinpath(exec_prefix, "sharedmodules"); + joinpath(exec_prefix, "lib-dynload"); if (exists(exec_prefix)) return 1; } @@ -301,7 +301,7 @@ search_for_exec_prefix(argv0_path, home) do { n = strlen(exec_prefix); joinpath(exec_prefix, lib_python); - joinpath(exec_prefix, "sharedmodules"); + joinpath(exec_prefix, "lib-dynload"); if (exists(exec_prefix)) return 1; exec_prefix[n] = '\0'; @@ -311,7 +311,7 @@ search_for_exec_prefix(argv0_path, home) /* Look at configure's EXEC_PREFIX */ strcpy(exec_prefix, EXEC_PREFIX); joinpath(exec_prefix, lib_python); - joinpath(exec_prefix, "sharedmodules"); + joinpath(exec_prefix, "lib-dynload"); if (exists(exec_prefix)) return 1; @@ -410,7 +410,7 @@ calculate_path() fprintf(stderr, "Could not find platform dependent libraries <exec_prefix>\n"); 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.) */ |