[Python-checkins] python/dist/src Makefile.pre.in,1.105,1.106 configure.in,1.380,1.381 configure,1.369,1.370

[jackjansen@users.sourceforge.net]

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

Modified Files:
	Makefile.pre.in configure.in configure 
Log Message:
Adapted for the move of Mac/Lib to Lib/plat-mac. Makefile.pre.in now
knows about plat-mac subdirectories, and configure adds a variable
EXTRAPLATDIR. These together take care of copying Lib/plat-mac to
the destination on darwin.

Adding plat-mac is still done with a .pth file which is only created when
you do a framework build. I'm not 100% happy with this, but fixing it
really needs a functional pythonw in non-framework builds, and I don't
think I can do that before 2.3a1 (but I'll try:-).


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Makefile.pre.in,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -d -r1.105 -r1.106
*** Makefile.pre.in	30 Dec 2002 21:02:01 -0000	1.105
--- Makefile.pre.in	30 Dec 2002 22:23:38 -0000	1.106
***************
*** 609,614 ****
  # Install the library
  PLATDIR=	plat-$(MACHDEP)
! MACHDEPS=	$(PLATDIR)
  XMLLIBSUBDIRS=  xml xml/dom xml/parsers xml/sax
  LIBSUBDIRS=	lib-old lib-tk site-packages test test/output test/data \
  		encodings email compiler hotshot logging bsddb \
--- 609,623 ----
  # Install the library
  PLATDIR=	plat-$(MACHDEP)
! EXTRAPLATDIR= @EXTRAPLATDIR@
! MACHDEPS=	$(PLATDIR) $(EXTRAPLATDIR)
  XMLLIBSUBDIRS=  xml xml/dom xml/parsers xml/sax
+ PLATMACDIRS= plat-mac plat-mac/Carbon plat-mac/lib-scriptpackages \
+ 	plat-mac/lib-scriptpackages/_BuiltinSuites \
+ 	plat-mac/lib-scriptpackages/CodeWarrior \
+ 	plat-mac/lib-scriptpackages/Explorer \
+ 	plat-mac/lib-scriptpackages/Finder \
+ 	plat-mac/lib-scriptpackages/Netscape \
+ 	plat-mac/lib-scriptpackages/StdSuites \
+ 	plat-mac/lib-scriptpackages/Terminal
  LIBSUBDIRS=	lib-old lib-tk site-packages test test/output test/data \
  		encodings email compiler hotshot logging bsddb \

Index: configure.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure.in,v
retrieving revision 1.380
retrieving revision 1.381
diff -C2 -d -r1.380 -r1.381
*** configure.in	30 Dec 2002 16:25:38 -0000	1.380
--- configure.in	30 Dec 2002 22:23:38 -0000	1.381
***************
*** 105,109 ****
  	esac
  fi
! 
  # Some systems cannot stand _XOPEN_SOURCE being defined at all; they
  # disable features if it is defined, without any means to access these
--- 105,109 ----
  	esac
  fi
! 	
  # Some systems cannot stand _XOPEN_SOURCE being defined at all; they
  # disable features if it is defined, without any means to access these
***************
*** 155,158 ****
--- 155,170 ----
  fi
  AC_MSG_RESULT($MACHDEP)
+ 
+ # 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
+ AC_MSG_RESULT($EXTRAPLATDIR)
  
  # checks for alternative programs

Index: configure
===================================================================
RCS file: /cvsroot/python/python/dist/src/configure,v
retrieving revision 1.369
retrieving revision 1.370
diff -C2 -d -r1.369 -r1.370
*** configure	30 Dec 2002 16:25:39 -0000	1.369
--- configure	30 Dec 2002 22:23:38 -0000	1.370
***************
*** 1389,1392 ****
--- 1389,1406 ----
  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="";;
+ 	esac
+ fi
+ echo "$as_me:$LINENO: result: $EXTRAPLATDIR" >&5
+ echo "${ECHO_T}$EXTRAPLATDIR" >&6
+ 
  # checks for alternative programs
  echo "$as_me:$LINENO: checking for --without-gcc" >&5
***************
*** 17297,17300 ****
--- 17311,17315 ----
  s,@MACHDEP@,$MACHDEP,;t t
  s,@SGI_ABI@,$SGI_ABI,;t t
+ s,@EXTRAPLATDIR@,$EXTRAPLATDIR,;t t
  s,@CXX@,$CXX,;t t
  s,@MAINOBJ@,$MAINOBJ,;t t