append the default path to $PYTHONPATH; ignore empty $PYTHONPATH.
default DATE is now 3 Jun 1992
diff --git a/Modules/config.c.in b/Modules/config.c.in
index d17e7de..fb33b1c 100644
--- a/Modules/config.c.in
+++ b/Modules/config.c.in
@@ -24,6 +24,9 @@
/* Configurable Python configuration file */
+#include "PROTO.h"
+#include "malloc.h"
+
#include "patchlevel.h"
#define VERSION "0.9.%d (%s)"
@@ -31,7 +34,7 @@
#ifdef __DATE__
#define DATE __DATE__
#else
-#define DATE ">= 6 Apr 1992"
+#define DATE ">= 3 Jun 1992"
#endif
#include <stdio.h>
@@ -82,7 +85,7 @@
}
#ifndef PYTHONPATH
-#define PYTHONPATH ".:/usr/local/lib/python"
+#define PYTHONPATH ".:/usr/local/lib/python"
#endif
extern char *getenv();
@@ -91,9 +94,20 @@
getpythonpath()
{
char *path = getenv("PYTHONPATH");
- if (path == 0)
- path = PYTHONPATH;
- return path;
+ char *defpath = PYTHONPATH;
+ char *buf;
+ int n;
+
+ if (path == 0 || *path == '\0')
+ return defpath;
+ n = strlen(path) + strlen(defpath) + 2;
+ buf = malloc(n);
+ if (buf == NULL)
+ return path; /* XXX too bad -- but not likely */
+ strcpy(buf, path);
+ strcat(buf, ":");
+ strcat(buf, defpath);
+ return buf;
}