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

Guido van Rossum gvanrossum@users.sourceforge.net
Mon, 22 Jan 2001 17:53:43 -0800


Update of /cvsroot/python/python/dist/src/Misc
In directory usw-pr-cvs1:/tmp/cvs-serv12972

Modified Files:
	Makefile.pre.in 
Log Message:
Get rid of weird @SET_CXX@ macro occurrence.


Index: Makefile.pre.in
===================================================================
RCS file: /cvsroot/python/python/dist/src/Misc/Makefile.pre.in,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -r1.19 -r1.20
*** Makefile.pre.in	2000/12/06 23:46:29	1.19
--- Makefile.pre.in	2001/01/23 01:53:41	1.20
***************
*** 129,133 ****
  CCSHARED=	@CCSHARED@
  LINKFORSHARED=	@LINKFORSHARED@
! #@SET_CXX@
  
  # Install prefix for architecture-independent files
--- 129,133 ----
  CCSHARED=	@CCSHARED@
  LINKFORSHARED=	@LINKFORSHARED@
! CXX=		@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 '/^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' \
--- 252,256 ----
  	 -e '/^VERSION=/s/^VERSION=[ 	]*\(.*\)/s%@VERSION[@]%\1%/p' \
  	 -e '/^CC=/s/^CC=[ 	]*\(.*\)/s%@CC[@]%\1%/p' \
! 	 -e '/^CXX=/s/^CXX=[ 	]*\(.*\)/s%@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_CXX@/d" >>sedscript
  	echo "/^installdir=/s%=.*%=	$(installdir)%" >>sedscript
  	echo "/^exec_installdir=/s%=.*%=$(exec_installdir)%" >>sedscript
--- 271,274 ----