Get rid of weird @SET_CXX@ macro occurrence.

diff --git a/Misc/Makefile.pre.in b/Misc/Makefile.pre.in
index f15a68f5e56464a566668a3a862363364b12d523..2d14294054a0d0e323456236931f1628002f052f 100644 (file)
--- a/Misc/Makefile.pre.in
+++ b/Misc/Makefile.pre.in
@@ -128,7 +128,7 @@ SO=         @SO@
 LDSHARED=      @LDSHARED@
 CCSHARED=      @CCSHARED@
 LINKFORSHARED= @LINKFORSHARED@
-#@SET_CXX@
+CXX=           @CXX@
 
 # Install prefix for architecture-independent files
 prefix=                /usr/local
@@ -251,7 +251,7 @@ sedscript:  $(MAKEFILE)
         -e '2s%.*%# $H%p' \
         -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 '/^CXX=/s/^CXX=[    ]*\(.*\)/s%@CXX[@]%\1%/p' \
         -e '/^LINKCC=/s/^LINKCC=[      ]*\(.*\)/s%@LINKCC[@]%\1%/p' \
         -e '/^OPT=/s/^OPT=[    ]*\(.*\)/s%@OPT[@]%\1%/p' \
         -e '/^LDFLAGS=/s/^LDFLAGS=[    ]*\(.*\)/s%@LDFLAGS[@]%\1%/p' \
@@ -270,7 +270,6 @@ sedscript:  $(MAKEFILE)
         -e '/^$P=/s/^$P=\(.*\)/s%^$P=.*%$P=\1%/p' \
         -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
        echo "/^srcdir=/s%=.*%=         $(srcdir)%" >>sedscript