[Python-checkins] python/dist/src Makefile.pre.in,1.116,1.117 configure.in,1.393,1.394

[jackjansen@users.sourceforge.net]

Update of /cvsroot/python/python/dist/src
In directory sc8-pr-cvs1:/tmp/cvs-serv7873

Modified Files:
	Makefile.pre.in configure.in 
Log Message:
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.


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.116
retrieving revision 1.117
diff -C2 -d -r1.116 -r1.117
*** Makefile.pre.in	4 Mar 2003 10:52:39 -0000	1.116
--- Makefile.pre.in	17 Mar 2003 15:43:32 -0000	1.117
***************
*** 613,616 ****
--- 613,617 ----
  PLATDIR=	plat-$(MACHDEP)
  EXTRAPLATDIR= @EXTRAPLATDIR@
+ EXTRAMACHDEPPATH=@EXTRAMACHDEPPATH@
  MACHDEPS=	$(PLATDIR) $(EXTRAPLATDIR)
  XMLLIBSUBDIRS=  xml xml/dom xml/parsers xml/sax
***************
*** 623,626 ****
--- 624,628 ----
  	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 \

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.393
retrieving revision 1.394
diff -C2 -d -r1.393 -r1.394
*** configure.in	14 Mar 2003 21:51:31 -0000	1.393
--- configure.in	17 Mar 2003 15:43:34 -0000	1.394
***************
*** 158,167 ****
  # And add extra plat-mac for darwin
  AC_SUBST(EXTRAPLATDIR)
  AC_MSG_CHECKING(EXTRAPLATDIR)
  if test -z "$EXTRAPLATDIR"
  then
  	case $MACHDEP in
! 	darwin)	EXTRAPLATDIR="\$(PLATMACDIRS)";;
! 	*) EXTRAPLATDIR="";;
  	esac
  fi
--- 158,174 ----
  # 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)"
! 		EXTRAMACHDEPPATH="\$(PLATMACPATH)"
! 		;;
! 	*) 
! 		EXTRAPLATDIR=""
! 		EXTRAMACHDEPPATH=""
! 		;;
  	esac
  fi