From: Jack Jansen <jack.jansen@cwi.nl>
Date: Sun, 18 Jun 1995 19:57:01 +0000 (+0000)
Subject: Obtain path from a resource (unless USE_BUILTIN_PATH is #defined)
X-Git-Tag: v1.3b1~275
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=68f1d45531d8e526917b9c0fe08c6e89d051b446;p=thirdparty%2FPython%2Fcpython.git

Obtain path from a resource (unless USE_BUILTIN_PATH is #defined)
---

diff --git a/Mac/Modules/config.c b/Mac/Modules/config.c
index 90221d383f65..385372a49508 100644
--- a/Mac/Modules/config.c
+++ b/Mac/Modules/config.c
@@ -142,7 +142,7 @@ getcopyright()
 #ifndef PYTHONPATH
 #ifdef macintosh
 /* Mod by Jack: \n is now separator. */
-#define PYTHONPATH ":\n:Lib\n:Lib:stdwin\n:Lib:test\n:Lib:mac"
+#define PYTHONPATH ":\n:Lib\n:Lib:stdwin\n:Lib:test\n:Lib:mac\n:PackedLib\n:PlugIns"
 #endif /* macintosh */
 #endif /* !PYTHONPATH */
 
@@ -172,10 +172,17 @@ getpythonpath()
 	char *p, *endp;
 	int newlen;
 	extern char *PyMac_GetPythonDir();
-	extern char *PyMac_GetScriptPath();
+#ifndef USE_BUILTIN_PATH
+	extern char *PyMac_GetPythonPath();
+#endif
 	
 	if ( pythonpath ) return pythonpath;
 	curwd = PyMac_GetPythonDir();
+#ifndef USE_BUILTIN_PATH
+	if ( pythonpath = PyMac_GetPythonPath(curwd) )
+		return pythonpath;
+	printf("Warning: No pythonpath resource found, using builtin default\n");
+#endif
 	p = PYTHONPATH;
 	endp = p;
 	pythonpath = malloc(2);