--- a/octave-bug.in
+++ b/octave-bug.in
@@ -14,34 +14,34 @@
 # compile Octave.
 
 config_opts=%config_opts%
-VERSION=%VERSION%
-MACHINE=%CANONICAL_HOST_TYPE%
-F77=%F77%
-FFLAGS=%FFLAGS%
-FPICFLAG=%FPICFLAG%
-FLIBS=%FLIBS%
-F2C=%F2C%
-F2CFLAGS=%F2CFLAGS%
-CPPFLAGS=%CPPFLAGS%
-INCFLAGS=%INCFLAGS%
-CC=%CC%
-CC_VERSION=%CC_VERSION%
-CFLAGS=%CFLAGS%
-CPICFLAG=%CPICFLAG%
-CXX=%CXX%
-CXX_VERSION=%CXX_VERSION%
-CXXFLAGS=%BUG_CXXFLAGS%
-CXXPICFLAG=%CXXPICFLAG%
-LDFLAGS=%LDFLAGS%
-LIBFLAGS=%LIBFLAGS%
-RLD_FLAG=%RLD_FLAG%
-TERMLIBS=%TERMLIBS%
-LIBS=%LIBS%
-LEXLIB=%LEXLIB%
-LIBPLPLOT=%LIBPLPLOT%
-LIBGLOB=%LIBGLOB%
-LIBDLFCN=%LIBDLFCN%
-DEFS=%DEFS%
+VERSION=%OCTAVE_CONF_VERSION%
+MACHINE=%OCTAVE_CONF_CANONICAL_HOST_TYPE%
+F77=%OCTAVE_CONF_F77%
+FFLAGS=%OCTAVE_CONF_FFLAGS%
+FPICFLAG=%OCTAVE_CONF_FPICFLAG%
+FLIBS=%OCTAVE_CONF_FLIBS%
+F2C=%OCTAVE_CONF_F2C%
+F2CFLAGS=%OCTAVE_CONF_F2CFLAGS%
+CPPFLAGS=%OCTAVE_CONF_CPPFLAGS%
+INCFLAGS=%OCTAVE_CONF_INCFLAGS%
+CC=%OCTAVE_CONF_CC%
+CC_VERSION=%OCTAVE_CONF_CC_VERSION%
+CFLAGS=%OCTAVE_CONF_CFLAGS%
+CPICFLAG=%OCTAVE_CONF_CPICFLAG%
+CXX=%OCTAVE_CONF_CXX%
+CXX_VERSION=%OCTAVE_CONF_CXX_VERSION%
+CXXFLAGS=%OCTAVE_CONF_BUG_CXXFLAGS%
+CXXPICFLAG=%OCTAVE_CONF_CXXPICFLAG%
+LDFLAGS=%OCTAVE_CONF_LDFLAGS%
+LIBFLAGS=%OCTAVE_CONF_LIBFLAGS%
+RLD_FLAG=%OCTAVE_CONF_RLD_FLAG%
+TERMLIBS=%OCTAVE_CONF_TERMLIBS%
+LIBS=%OCTAVE_CONF_LIBS%
+LEXLIB=%OCTAVE_CONF_LEXLIB%
+LIBPLPLOT=%OCTAVE_CONF_LIBPLPLOT%
+LIBGLOB=%OCTAVE_CONF_LIBGLOB%
+LIBDLFCN=%OCTAVE_CONF_LIBDLFCN%
+DEFS=%OCTAVE_CONF_DEFS%
 
 : ${USER=$LOGNAME}