Changeset 20 for python

Timestamp:

Sep 14, 2010, 1:16:59 PM (15 years ago)

Author:

Yuri Dario

Message:

python: fix loading path and prefix access.

File:

• python/trunk/Modules/getpath.c (modified) (4 diffs)

python/trunk/Modules/getpath.c

@@ -126 +126 @@
 //                      ";./Lib/lib-dynload;./Lib/site-packages"
 // force unixroot
-#define PYTHONPATH PREFIX "/lib/python" VERSION ";" \
-              EXEC_PREFIX "/lib/python" VERSION "/lib-" PLATFORM ";" \
-              EXEC_PREFIX "/lib/python" VERSION "/site-packages" ";" \
-              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ";" \
+#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
+              EXEC_PREFIX "/lib/python" VERSION "/lib-" PLATFORM ":" \
+              EXEC_PREFIX "/lib/python" VERSION "/site-packages" ":" \
+              EXEC_PREFIX "/lib/python" VERSION "/lib-dynload" ":" \
 /* now local (for building) */ \
-              "./lib" ";" \
-              "./lib/plat-" PLATFORM ";" \
-              "./lib/site-packages" ";" \
+              "./lib" ":" \
+              "./lib/plat-" PLATFORM ":" \
+              "./lib/site-packages" ":" \
               "./lib/lib-dynload"
 #endif
@@ -660 +660 @@
      * return the compiled-in defaults instead.
      */
+#ifndef __KLIBC__ // YD force hardcoded build prefix
     if (pfound > 0) {
         reduce(prefix);
@@ -669 +670 @@
     }
     else
+#endif
         strncpy(prefix, PREFIX, MAXPATHLEN);
 
+#ifndef __KLIBC__ // YD force hardcoded build exec_prefix
     if (efound > 0) {
         reduce(exec_prefix);
@@ -679 +682 @@
     }
     else
+#endif
         strncpy(exec_prefix, EXEC_PREFIX, MAXPATHLEN);
 }