Blob Blame History Raw
diff -rupN Python-2.7.13/configure.ac Python-2.7.13-new/configure.ac
--- Python-2.7.13/configure.ac	2017-01-21 01:46:09.881571522 +0100
+++ Python-2.7.13-new/configure.ac	2017-01-21 01:46:09.884571490 +0100
@@ -558,6 +558,16 @@ then
 fi
 AC_MSG_RESULT($EXTRAPLATDIR)
 
+# Windows uses ; to separate paths, everything else uses :
+AC_MSG_CHECKING(DELIM)
+DELIM=:
+if test "$MACHDEP" = "win32"
+then
+	DELIM=\;
+fi
+AC_MSG_RESULT([$DELIM])
+AC_SUBST(DELIM)
+
 AC_MSG_CHECKING([for init system calls])
 AC_SUBST(INITSYS)
 case $host in
diff -rupN Python-2.7.13/Include/osdefs.h Python-2.7.13-new/Include/osdefs.h
--- Python-2.7.13/Include/osdefs.h	2016-12-17 21:05:05.000000000 +0100
+++ Python-2.7.13-new/Include/osdefs.h	2017-01-21 01:46:09.884571490 +0100
@@ -10,7 +10,7 @@ extern "C" {
 /* Mod by chrish: QNX has WATCOM, but isn't DOS */
 #if !defined(__QNX__)
 #if defined(MS_WINDOWS) || defined(__BORLANDC__) || defined(__WATCOMC__) || defined(__DJGPP__) || defined(PYOS_OS2)
-#if defined(PYOS_OS2) && defined(PYCC_GCC)
+#if (defined(PYOS_OS2) && defined(PYCC_GCC)) || defined(__MINGW32__)
 #define MAXPATHLEN 260
 #define SEP '/'
 #define ALTSEP '\\'
@@ -20,6 +20,7 @@ extern "C" {
 #define MAXPATHLEN 256
 #endif
 #define DELIM ';'
+#define DELIMSTR ";"
 #endif
 #endif
 
@@ -27,6 +28,7 @@ extern "C" {
 #define SEP '.'
 #define MAXPATHLEN 256
 #define DELIM ','
+#define DELIMSTR ","
 #endif
 
 
@@ -55,6 +57,7 @@ extern "C" {
 /* Search path entry delimiter */
 #ifndef DELIM
 #define DELIM ':'
+#define DELIMSTR ":"
 #endif
 
 #ifdef __cplusplus
diff -rupN Python-2.7.13/Makefile.pre.in Python-2.7.13-new/Makefile.pre.in
--- Python-2.7.13/Makefile.pre.in	2017-01-21 01:46:09.444576188 +0100
+++ Python-2.7.13-new/Makefile.pre.in	2017-01-21 01:46:09.885571479 +0100
@@ -89,7 +89,8 @@ CFLAGSFORSHARED=@CFLAGSFORSHARED@
 # C flags used for building the interpreter object files
 PY_CFLAGS=	$(CFLAGS) $(CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE
 
-
+# ; on Windows otherwise :
+DELIM=		@DELIM@
 # Machine-dependent subdirectories
 MACHDEP=	@MACHDEP@
 
diff -rupN Python-2.7.13/Modules/Setup.dist Python-2.7.13-new/Modules/Setup.dist
--- Python-2.7.13/Modules/Setup.dist	2017-01-21 01:46:05.851614549 +0100
+++ Python-2.7.13-new/Modules/Setup.dist	2017-01-21 01:46:09.885571479 +0100
@@ -84,22 +84,22 @@ MACHDESTLIB=$(BINLIBDEST)
 # 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=:$(PLATDIR)
+MACHDEPPATH=$(DELIM)$(PLATDIR)
 EXTRAMACHDEPPATH=
 
 # Path component for the Tkinter-related modules
 # The TKPATH variable is always enabled, to save you the effort.
-TKPATH=:lib-tk
+TKPATH=$(DELIM)lib-tk
 
 # Path component for old modules.
-OLDPATH=:lib-old
+OLDPATH=$(DELIM)lib-old
 
 COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)$(TKPATH)$(OLDPATH)
 PYTHONPATH=$(COREPYTHONPATH)