--- ./makeinclude.in.orig	Tue Apr 11 00:06:06 2006
+++ ./makeinclude.in	Fri Apr 14 15:42:25 2006
@@ -49,11 +49,11 @@
 
 # compiler names:
 CC		= @CC@
-CXX		= @CXX@
+CXX		= %%CXX%%
 MAKEDEPEND	= @MAKEDEPEND@
 
 # flags for C++ compiler:
-OPTIM		= @OPTIM@
+OPTIM		= 
 CFLAGS		= $(OPTIM) @CFLAGS@
 CXXFLAGS	= $(OPTIM) @CXXFLAGS@