Added a define EXTRAMACHDEPPATH which can be used to add sys.path items

for specific platforms. Use this to add plat-mac and
plat-mac/lib-scriptpackages on MacOSX. Also tested for not having adverse
effects on Linux, and I think this code isn't used on Windows anyway.

Fixes #661521.

diff --git a/Makefile.pre.in b/Makefile.pre.in
index c767dd57da864f09cd7de9a7244d6a8329427a47..333f348cb44834eeaf180588808984af72a53bcd 100644 (file)
--- a/Makefile.pre.in
+++ b/Makefile.pre.in
@@ -612,6 +612,7 @@ maninstall:
 # Install the library
 PLATDIR=       plat-$(MACHDEP)
 EXTRAPLATDIR= @EXTRAPLATDIR@
+EXTRAMACHDEPPATH=@EXTRAMACHDEPPATH@
 MACHDEPS=      $(PLATDIR) $(EXTRAPLATDIR)
 XMLLIBSUBDIRS=  xml xml/dom xml/parsers xml/sax
 PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
@@ -622,6 +623,7 @@ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
        plat-mac/lib-scriptpackages/Netscape \
        plat-mac/lib-scriptpackages/StdSuites \
        plat-mac/lib-scriptpackages/Terminal
+PLATMACPATH=:plat-mac:plat-mac/lib-scriptpackages
 LIBSUBDIRS=    lib-old lib-tk site-packages test test/output test/data \
                encodings email email/test email/test/data compiler hotshot \
                logging bsddb bsddb/test \

diff --git a/Modules/Setup.dist b/Modules/Setup.dist
index bebcd08dae5622f926a46b7f0fe3f0ea0876f7a6..0c7722f5dc7cb884c57c3181479b52677de1a356 100644 (file)
--- a/Modules/Setup.dist
+++ b/Modules/Setup.dist
@@ -92,12 +92,13 @@ TESTPATH=
 
 # Path components for machine- or system-dependent modules and shared libraries
 MACHDEPPATH=:plat-$(MACHDEP)
+EXTRAMACHDEPPATH=
 
 # Path component for the Tkinter-related modules
 # The TKPATH variable is always enabled, to save you the effort.
 TKPATH=:lib-tk
 
-COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(TKPATH)
+COREPYTHONPATH=$(DESTPATH)$(SITEPATH)$(TESTPATH)$(MACHDEPPATH)$(EXTRAMACHDEPPATH)$(TKPATH)
 PYTHONPATH=$(COREPYTHONPATH)
 
 

diff --git a/configure b/configure
index 09337d81ad936acf50c2bf458a91499747acccb5..9e9224aff28788fb7be91b06e84bda65e6efd5e0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.392 .
+# From configure.in Revision: 1.393 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53 for python 2.3.
 #
@@ -1390,13 +1390,20 @@ echo "${ECHO_T}$MACHDEP" >&6
 
 # And add extra plat-mac for darwin
 
+
 echo "$as_me:$LINENO: checking EXTRAPLATDIR" >&5
 echo $ECHO_N "checking EXTRAPLATDIR... $ECHO_C" >&6
 if test -z "$EXTRAPLATDIR"
 then
        case $MACHDEP in
-       darwin) EXTRAPLATDIR="\$(PLATMACDIRS)";;
-       *) EXTRAPLATDIR="";;
+       darwin)
+               EXTRAPLATDIR="\$(PLATMACDIRS)"
+               EXTRAMACHDEPPATH="\$(PLATMACPATH)"
+               ;;
+       *)
+               EXTRAPLATDIR=""
+               EXTRAMACHDEPPATH=""
+               ;;
        esac
 fi
 echo "$as_me:$LINENO: result: $EXTRAPLATDIR" >&5
@@ -17468,6 +17475,7 @@ s,@PYTHONFRAMEWORKINSTALLDIR@,$PYTHONFRAMEWORKINSTALLDIR,;t t
 s,@MACHDEP@,$MACHDEP,;t t
 s,@SGI_ABI@,$SGI_ABI,;t t
 s,@EXTRAPLATDIR@,$EXTRAPLATDIR,;t t
+s,@EXTRAMACHDEPPATH@,$EXTRAMACHDEPPATH,;t t
 s,@CXX@,$CXX,;t t
 s,@MAINOBJ@,$MAINOBJ,;t t
 s,@EXEEXT@,$EXEEXT,;t t

diff --git a/configure.in b/configure.in
index bcde551048a69155e633e6a477a9b4c2401e8f16..229caef6ec661ff1c25b561b7700c9cca8f2edab 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -157,12 +157,19 @@ AC_MSG_RESULT($MACHDEP)
 
 # And add extra plat-mac for darwin
 AC_SUBST(EXTRAPLATDIR)
+AC_SUBST(EXTRAMACHDEPPATH)
 AC_MSG_CHECKING(EXTRAPLATDIR)
 if test -z "$EXTRAPLATDIR"
 then
        case $MACHDEP in
-       darwin) EXTRAPLATDIR="\$(PLATMACDIRS)";;
-       *) EXTRAPLATDIR="";;
+       darwin) 
+               EXTRAPLATDIR="\$(PLATMACDIRS)"
+               EXTRAMACHDEPPATH="\$(PLATMACPATH)"
+               ;;
+       *) 
+               EXTRAPLATDIR=""
+               EXTRAMACHDEPPATH=""
+               ;;
        esac
 fi
 AC_MSG_RESULT($EXTRAPLATDIR)