85 lines
2.4 KiB
Diff
85 lines
2.4 KiB
Diff
diff -Naur a/configure.ac b/configure.ac
|
|
--- a/configure.ac 2014-03-18 00:07:17.244200000 +0400
|
|
+++ b/configure.ac 2014-03-18 00:07:17.415800000 +0400
|
|
@@ -599,6 +599,16 @@
|
|
fi
|
|
AC_MSG_RESULT($MACHDEP)
|
|
|
|
+# Windows uses ; to separate paths, everything else uses :
|
|
+AC_MSG_CHECKING(DELIM)
|
|
+DELIM=:
|
|
+if test "$MACHDEP" = "win"
|
|
+then
|
|
+ DELIM=\;
|
|
+fi
|
|
+AC_MSG_RESULT([$DELIM])
|
|
+AC_SUBST(DELIM)
|
|
+
|
|
AC_MSG_CHECKING([for init system calls])
|
|
AC_SUBST(INITSYS)
|
|
case $host in
|
|
diff -Naur a/Include/osdefs.h b/Include/osdefs.h
|
|
--- a/Include/osdefs.h 2014-03-17 06:31:29.000000000 +0400
|
|
+++ b/Include/osdefs.h 2014-03-18 00:07:17.415800000 +0400
|
|
@@ -14,6 +14,7 @@
|
|
#define ALTSEP L'/'
|
|
#define MAXPATHLEN 256
|
|
#define DELIM L';'
|
|
+#define DELIMSTR ";"
|
|
#endif
|
|
#endif
|
|
|
|
@@ -42,6 +43,7 @@
|
|
/* Search path entry delimiter */
|
|
#ifndef DELIM
|
|
#define DELIM L':'
|
|
+#define DELIMSTR ":"
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
diff -Naur a/Makefile.pre.in b/Makefile.pre.in
|
|
--- a/Makefile.pre.in 2014-03-18 00:07:11.425400000 +0400
|
|
+++ b/Makefile.pre.in 2014-03-18 00:07:17.415800000 +0400
|
|
@@ -93,7 +93,8 @@
|
|
# C flags used for building the interpreter object files
|
|
PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
|
|
|
|
-
|
|
+# ; on Windows otherwise :
|
|
+DELIM= @DELIM@
|
|
# Machine-dependent subdirectories
|
|
MACHDEP= @MACHDEP@
|
|
|
|
diff -Naur a/Modules/getpath.c b/Modules/getpath.c
|
|
--- a/Modules/getpath.c 2014-03-17 06:31:31.000000000 +0400
|
|
+++ b/Modules/getpath.c 2014-03-18 00:07:17.415800000 +0400
|
|
@@ -118,7 +118,7 @@
|
|
#endif
|
|
|
|
#ifndef PYTHONPATH
|
|
-#define PYTHONPATH PREFIX "/lib/python" VERSION ":" \
|
|
+#define PYTHONPATH PREFIX "/lib/python" VERSION DELIMSTR \
|
|
EXEC_PREFIX "/lib/python" VERSION "/lib-dynload"
|
|
#endif
|
|
|
|
diff -Naur a/Modules/Setup.dist b/Modules/Setup.dist
|
|
--- a/Modules/Setup.dist 2014-03-18 00:06:07.387400000 +0400
|
|
+++ b/Modules/Setup.dist 2014-03-18 00:07:17.415800000 +0400
|
|
@@ -84,14 +84,14 @@
|
|
# Empty since this is now just the runtime prefix.
|
|
DESTPATH=
|
|
|
|
-# Site specific path components -- should begin with : if non-empty
|
|
+# Site specific path components -- should begin with $(DELIM) if non-empty
|
|
SITEPATH=
|
|
|
|
# Standard path components for test modules
|
|
TESTPATH=
|
|
|
|
# Path components for machine- or system-dependent modules and shared libraries
|
|
-MACHDEPPATH=:plat-$(MACHDEP)
|
|
+MACHDEPPATH=$(DELIM)plat-$(MACHDEP)
|
|
EXTRAMACHDEPPATH=
|
|
|
|
COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)
|