--- a/src/toplev.cc
+++ b/src/toplev.cc
@@ -227,10 +227,10 @@
 
   std::string msg;
 
-  if (strcmp (CANONICAL_HOST_TYPE, "unknown") == 0)
+  if (strcmp (OCTAVE_CANONICAL_HOST_TYPE, "unknown") == 0)
     msg = "Hi Dave, I'm a HAL-9000";
   else
-    msg = CANONICAL_HOST_TYPE;
+    msg = OCTAVE_CANONICAL_HOST_TYPE;
 
   if (nargout == 0)
     octave_stdout << msg << "\n";
@@ -606,52 +606,106 @@
 
   Octave_map m;
 
-  // XXX FIXME XXX -- should we perform OCTAVE_HOME substitution on these?
-
-  m ["default_pager"] = DEFAULT_PAGER;
-  m ["prefix"] = OCTAVE_PREFIX;
-  m ["exec_prefix"] = OCTAVE_EXEC_PREFIX;
+  m ["ALL_CFLAGS"] = OCTAVE_CONF_ALL_CFLAGS;
+  m ["ALL_CXXFLAGS"] = OCTAVE_CONF_ALL_CXXFLAGS;
+  m ["ALL_FFLAGS"] = OCTAVE_CONF_ALL_FFLAGS;
+  m ["ALL_LDFLAGS"] = OCTAVE_CONF_ALL_LDFLAGS;
+  m ["AR"] = OCTAVE_CONF_AR;
+  m ["ARFLAGS"] = OCTAVE_CONF_ARFLAGS;
+  m ["CC"] = OCTAVE_CONF_CC;
+  m ["CC_VERSION"] = OCTAVE_CONF_CC_VERSION;
+  m ["CFLAGS"] = OCTAVE_CONF_CFLAGS;
+  m ["CPICFLAG"] = OCTAVE_CONF_CPICFLAG;
+  m ["CPPFLAGS"] = OCTAVE_CONF_CPPFLAGS;
+  m ["CXX"] = OCTAVE_CONF_CXX;
+  m ["CXXCPP"] = OCTAVE_CONF_CXXCPP;
+  m ["CXXFLAGS"] = OCTAVE_CONF_CXXFLAGS;
+  m ["CXXPICFLAG"] = OCTAVE_CONF_CXXPICFLAG;
+  m ["CXX_VERSION"] = OCTAVE_CONF_CXX_VERSION;
+  m ["DEFAULT_PAGER"] = OCTAVE_DEFAULT_PAGER;
+  m ["DLFCN_INCFLAGS"] = OCTAVE_CONF_DLFCN_INCFLAGS;
+  m ["EXE"] = OCTAVE_CONF_EXE;
+  m ["F2C"] = OCTAVE_CONF_F2C;
+  m ["F2CFLAGS"] = OCTAVE_CONF_F2CFLAGS;
+  m ["F77"] = OCTAVE_CONF_F77;
+  m ["FC"] = OCTAVE_CONF_FC;
+  m ["FFLAGS"] = OCTAVE_CONF_FFLAGS;
+  m ["FLIBS"] = OCTAVE_CONF_FLIBS;
+  m ["FORTRAN_MAIN_FLAG"] = OCTAVE_CONF_FORTRAN_MAIN_FLAG;
+  m ["FPICFLAG"] = OCTAVE_CONF_FPICFLAG;
+  m ["GLOB_INCFLAGS"] = OCTAVE_CONF_GLOB_INCFLAGS;
+  m ["INCFLAGS"] = OCTAVE_CONF_INCFLAGS;
+  m ["LDFLAGS"] = OCTAVE_CONF_LDFLAGS;
+  m ["LD_STATIC_FLAG"] = OCTAVE_CONF_LD_STATIC_FLAG;
+  m ["LEX"] = OCTAVE_CONF_LEX;
+  m ["LEXLIB"] = OCTAVE_CONF_LEXLIB;
+  m ["LFLAGS"] = OCTAVE_CONF_LFLAGS;
+  m ["LIBCRUFT"] = OCTAVE_CONF_LIBCRUFT;
+  m ["LIBDLFCN"] = OCTAVE_CONF_LIBDLFCN;
+  m ["LIBEXT"] = OCTAVE_CONF_LIBEXT;
+  m ["LIBFLAGS"] = OCTAVE_CONF_LIBFLAGS;
+  m ["LIBGLOB"] = OCTAVE_CONF_LIBGLOB;
+  m ["LIBKPATHSEA"] = OCTAVE_CONF_LIBKPATHSEA;
+  m ["LIBOCTAVE"] = OCTAVE_CONF_LIBOCTAVE;
+  m ["LIBOCTINTERP"] = OCTAVE_CONF_LIBOCTINTERP;
+  m ["LIBPLPLOT"] = OCTAVE_CONF_LIBPLPLOT;
+  m ["LIBREADLINE"] = OCTAVE_CONF_LIBREADLINE;
+  m ["LIBS"] = OCTAVE_CONF_LIBS;
+  m ["LN_S"] = OCTAVE_CONF_LN_S;
+  m ["OCTAVE_LITE"] = OCTAVE_CONF_OCTAVE_LITE;
+  m ["RANLIB"] = OCTAVE_CONF_RANLIB;
+  m ["RDYNAMIC_FLAG"] = OCTAVE_CONF_RDYNAMIC_FLAG;
+  m ["RLD_FLAG"] = OCTAVE_CONF_RLD_FLAG;
+  m ["RUNTEST"] = OCTAVE_CONF_RUNTEST;
+  m ["SHARED_LIBS"] = OCTAVE_CONF_SHARED_LIBS;
+  m ["SHLEXT"] = OCTAVE_CONF_SHLEXT;
+  m ["SHLEXT_VER"] = OCTAVE_CONF_SHLEXT_VER;
+  m ["SH_LD"] = OCTAVE_CONF_SH_LD;
+  m ["SH_LDFLAGS"] = OCTAVE_CONF_SH_LDFLAGS;
+  m ["SONAME_FLAGS"] = OCTAVE_CONF_SONAME_FLAGS;
+  m ["SPECIAL_MATH_LIB"] = OCTAVE_CONF_SPECIAL_MATH_LIB;
+  m ["STATIC_LIBS"] = OCTAVE_CONF_STATIC_LIBS;
+  m ["TERMLIBS"] = OCTAVE_CONF_TERMLIBS;
+  m ["UGLY_DEFS"] = OCTAVE_CONF_DEFS;
+  m ["UGLY_DEFS"] = OCTAVE_CONF_UGLY_DEFS;
+  m ["WITH_DL"] = OCTAVE_CONF_WITH_DL;
+  m ["WITH_DYNAMIC_LINKING"] = OCTAVE_CONF_WITH_DYNAMIC_LINKING;
+  m ["WITH_SHL"] = OCTAVE_CONF_WITH_SHL;
+  m ["XTRA_CFLAGS"] = OCTAVE_CONF_XTRA_CFLAGS;
+  m ["XTRA_CXXFLAGS"] = OCTAVE_CONF_XTRA_CXXFLAGS;
+  m ["YACC"] = OCTAVE_CONF_YACC;
+  m ["YFLAGS"] = OCTAVE_CONF_YFLAGS;
+  m ["archlibdir"] = OCTAVE_ARCHLIBDIR;
+  m ["bindir"] = OCTAVE_BINDIR;
+  m ["canonical_host_type"] = OCTAVE_CANONICAL_HOST_TYPE;
+  m ["config_opts"] = OCTAVE_CONF_config_opts;
   m ["datadir"] = OCTAVE_DATADIR;
   m ["dld"] = static_cast<double> (octave_supports_dynamic_linking);
-  m ["libdir"] = OCTAVE_LIBDIR;
-  m ["bindir"] = OCTAVE_BINDIR;
-  m ["infodir"] = OCTAVE_INFODIR;
+  m ["exec_prefix"] = OCTAVE_EXEC_PREFIX;
   m ["fcnfiledir"] = OCTAVE_FCNFILEDIR;
-  m ["localfcnfiledir"] = OCTAVE_LOCALFCNFILEDIR;
-  m ["localstartupfiledir"] = OCTAVE_LOCALSTARTUPFILEDIR;
-  m ["startupfiledir"] = OCTAVE_STARTUPFILEDIR;
-  m ["localfcnfilepath"] = OCTAVE_LOCALFCNFILEPATH;
-  m ["archlibdir"] = OCTAVE_ARCHLIBDIR;
-  m ["localarchlibdir"] = OCTAVE_LOCALARCHLIBDIR;
-  m ["octfiledir"] = OCTAVE_OCTFILEDIR;
-  m ["localoctfilepath"] = OCTAVE_LOCALOCTFILEPATH;
   m ["fcnfilepath"] = OCTAVE_FCNFILEPATH;
+  m ["imagedir"] = OCTAVE_IMAGEDIR;
   m ["imagepath"] = OCTAVE_IMAGEPATH;
-  m ["canonical_host_type"] = CANONICAL_HOST_TYPE;
-  m ["configure_options"] = config_opts;
-  m ["F77"] = F77;
-  m ["FFLAGS"] = FFLAGS;
-  m ["FPICFLAG"] = FPICFLAG;
-  m ["F2C"] = F2C;
-  m ["F2CFLAGS"] = F2CFLAGS;
-  m ["FLIBS"] = FLIBS;
-  m ["CPPFLAGS"] = CPPFLAGS;
-  m ["INCFLAGS"] = INCFLAGS;
-  m ["CC"] = CC " " CC_VERSION;
-  m ["CFLAGS"] = CFLAGS;
-  m ["CPICFLAG"] = CPICFLAG;
-  m ["CXX"] = CXX " " CXX_VERSION;
-  m ["CXXFLAGS"] = CXXFLAGS;
-  m ["CXXPICFLAG"] = CXXPICFLAG;
-  m ["LDFLAGS"] = LDFLAGS;
-  m ["LIBFLAGS"] = LIBFLAGS;
-  m ["RLD_FLAG"] = RLD_FLAG;
-  m ["TERMLIBS"] = TERMLIBS;
-  m ["LIBS"] = LIBS;
-  m ["LEXLIB"] = LEXLIB;
-  m ["LIBPLPLOT"] = LIBPLPLOT;
-  m ["LIBDLFCN"] = LIBDLFCN;
-  m ["DEFS"] = DEFS;
+  m ["includedir"] = OCTAVE_INCLUDEDIR;
+  m ["infodir"] = OCTAVE_INFODIR;
+  m ["infofile"] = OCTAVE_INFOFILE;
+  m ["libdir"] = OCTAVE_LIBDIR;
+  m ["libexecdir"] = OCTAVE_LIBEXECDIR;
+  m ["localarchlibdir"] = OCTAVE_LOCALARCHLIBDIR;
+  m ["localfcnfiledir"] = OCTAVE_LOCALFCNFILEDIR;
+  m ["localfcnfilepath"] = OCTAVE_LOCALFCNFILEPATH;
+  m ["localoctfiledir"] = OCTAVE_LOCALOCTFILEDIR;
+  m ["localoctfilepath"] = OCTAVE_LOCALOCTFILEPATH;
+  m ["localstartupfiledir"] = OCTAVE_LOCALSTARTUPFILEDIR;
+  m ["man1dir"] = OCTAVE_MAN1DIR;
+  m ["man1ext"] = OCTAVE_MAN1EXT;
+  m ["mandir"] = OCTAVE_MANDIR;
+  m ["octfiledir"] = OCTAVE_OCTFILEDIR;
+  m ["octincludedir"] = OCTAVE_OCTINCLUDEDIR;
+  m ["octlibdir"] = OCTAVE_OCTLIBDIR;
+  m ["prefix"] = OCTAVE_PREFIX;
+  m ["startupfiledir"] = OCTAVE_STARTUPFILEDIR;
+  m ["version"] = OCTAVE_VERSION;
 
   int nargin = args.length ();