[Python-checkins] CVS: python/dist/src/Misc Makefile.pre.in,1.18,1.19

Guido van Rossum python-dev@python.org
Wed, 6 Dec 2000 15:46:31 -0800


Update of /cvsroot/python/python/dist/src/Misc
In directory slayer.i.sourceforge.net:/tmp/cvs-serv23505/Misc

Modified Files:
	Makefile.pre.in 
Log Message:
The C+ compiler is called $(CXX) these days, not CCC.
This fixes SF Bug #124478.


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/Makefile.pre.in,v
retrieving revision 1.18
retrieving revision 1.19
diff -C2 -r1.18 -r1.19
*** Makefile.pre.in	2000/10/26 17:07:01	1.18
--- Makefile.pre.in	2000/12/06 23:46:29	1.19
***************
*** 129,133 ****
  CCSHARED=	@CCSHARED@
  LINKFORSHARED=	@LINKFORSHARED@
! #@SET_CCC@
  
  # Install prefix for architecture-independent files
--- 129,133 ----
  CCSHARED=	@CCSHARED@
  LINKFORSHARED=	@LINKFORSHARED@
! #@SET_CXX@
  
  # Install prefix for architecture-independent files
***************
*** 252,256 ****
  	 -e '/^VERSION=/s/^VERSION=[ 	]*\(.*\)/s%@VERSION[@]%\1%/p' \
  	 -e '/^CC=/s/^CC=[ 	]*\(.*\)/s%@CC[@]%\1%/p' \
! 	 -e '/^CCC=/s/^CCC=[ 	]*\(.*\)/s%#@SET_CCC[@]%CCC=\1%/p' \
  	 -e '/^LINKCC=/s/^LINKCC=[ 	]*\(.*\)/s%@LINKCC[@]%\1%/p' \
  	 -e '/^OPT=/s/^OPT=[ 	]*\(.*\)/s%@OPT[@]%\1%/p' \
--- 252,256 ----
  	 -e '/^VERSION=/s/^VERSION=[ 	]*\(.*\)/s%@VERSION[@]%\1%/p' \
  	 -e '/^CC=/s/^CC=[ 	]*\(.*\)/s%@CC[@]%\1%/p' \
! 	 -e '/^CXX=/s/^CXX=[ 	]*\(.*\)/s%#@SET_CXX[@]%CXX=\1%/p' \
  	 -e '/^LINKCC=/s/^LINKCC=[ 	]*\(.*\)/s%@LINKCC[@]%\1%/p' \
  	 -e '/^OPT=/s/^OPT=[ 	]*\(.*\)/s%@OPT[@]%\1%/p' \
***************
*** 271,275 ****
  	 -e '/^$E=/s/^$E=\(.*\)/s%^$E=.*%$E=\1%/p' \
  	 $(MAKEFILE) >sedscript
! 	echo "/^#@SET_CCC@/d" >>sedscript
  	echo "/^installdir=/s%=.*%=	$(installdir)%" >>sedscript
  	echo "/^exec_installdir=/s%=.*%=$(exec_installdir)%" >>sedscript
--- 271,275 ----
  	 -e '/^$E=/s/^$E=\(.*\)/s%^$E=.*%$E=\1%/p' \
  	 $(MAKEFILE) >sedscript
! 	echo "/^#@SET_CXX@/d" >>sedscript
  	echo "/^installdir=/s%=.*%=	$(installdir)%" >>sedscript
  	echo "/^exec_installdir=/s%=.*%=$(exec_installdir)%" >>sedscript