--- a/mkoctfile.in	Sun Jan 25 08:27:25 1998 +0000
+++ b/mkoctfile.in	Thu Jan 29 04:46:36 1998 +0000
@@ -21,18 +21,17 @@
 : ${CXX=%CXX%}
 : ${CXXFLAGS=%CXXFLAGS%}
 : ${CXXPICFLAG=%CXXPICFLAG%}
-: ${HOST_CXXFLAGS=%HOST_CXXFLAGS%}
-: ${NO_IMPLICIT_TEMPLATES=%NO_IMPLICIT_TEMPLATES%}
-: ${GCC_IEEE_FP_FLAG=%GCC_IEEE_FP_FLAG%}
+: ${XTRA_CFLAGS=%XTRA_CFLAGS%}
+: ${XTRA_CXXFLAGS=%XTRA_CXXFLAGS%}
 
 : ${SH_LD=%SH_LD%}
 : ${SH_LDFLAGS=%SH_LDFLAGS%}
 
 : ${ALL_FFLAGS="$FFLAGS"}
 
-: ${ALL_CFLAGS="$INCFLAGS $GCC_IEEE_FP_FLAG $CFLAGS"}
+: ${ALL_CFLAGS="$INCFLAGS $XTRA_CFLAGS $CFLAGS"}
 
-: ${ALL_CXXFLAGS="$INCFLAGS $HOST_CXXFLAGS $NO_IMPLICIT_TEMPLATES $GCC_IEEE_FP_FLAG $CXXFLAGS"}
+: ${ALL_CXXFLAGS="$INCFLAGS $XTRA_CXXFLAGS $CXXFLAGS"}
 
 # Local variables.