--- a/mkoctfile.in	Tue Feb 08 09:00:12 2000 +0000
+++ b/mkoctfile.in	Tue Feb 08 10:09:06 2000 +0000
@@ -10,22 +10,22 @@
 # Default values for these variables are filled in when Octave is
 # compiled. 
 
-: ${CPPFLAGS=%CPPFLAGS%}
-: ${INCFLAGS=%INCFLAGS%}
-: ${F77=%F77%}
-: ${FFLAGS=%FFLAGS%}
-: ${FPICFLAG=%FPICFLAG%}
-: ${CC=%CC%}
-: ${CFLAGS=%CFLAGS%}
-: ${CPICFLAG=%CPICFLAG%}
-: ${CXX=%CXX%}
-: ${CXXFLAGS=%CXXFLAGS%}
-: ${CXXPICFLAG=%CXXPICFLAG%}
-: ${XTRA_CFLAGS=%XTRA_CFLAGS%}
-: ${XTRA_CXXFLAGS=%XTRA_CXXFLAGS%}
+: ${CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%}
+: ${INCFLAGS=%OCTAVE_CONF_INCFLAGS%}
+: ${F77=%OCTAVE_CONF_F77%}
+: ${FFLAGS=%OCTAVE_CONF_FFLAGS%}
+: ${FPICFLAG=%OCTAVE_CONF_FPICFLAG%}
+: ${CC=%OCTAVE_CONF_CC%}
+: ${CFLAGS=%OCTAVE_CONF_CFLAGS%}
+: ${CPICFLAG=%OCTAVE_CONF_CPICFLAG%}
+: ${CXX=%OCTAVE_CONF_CXX%}
+: ${CXXFLAGS=%OCTAVE_CONF_CXXFLAGS%}
+: ${CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%}
+: ${XTRA_CFLAGS=%OCTAVE_CONF_XTRA_CFLAGS%}
+: ${XTRA_CXXFLAGS=%OCTAVE_CONF_XTRA_CXXFLAGS%}
 
-: ${SH_LD=%SH_LD%}
-: ${SH_LDFLAGS=%SH_LDFLAGS%}
+: ${SH_LD=%OCTAVE_CONF_SH_LD%}
+: ${SH_LDFLAGS=%OCTAVE_CONF_SH_LDFLAGS%}
 
 : ${ALL_FFLAGS="$FFLAGS"}