--- a/Makeconf.in	Sun Feb 06 05:05:47 2000 +0000
+++ b/Makeconf.in	Mon Feb 07 09:24:41 2000 +0000
@@ -315,66 +315,110 @@
 define do-subst-config-vals
 echo "making $@ from $<"
 sed < $< \
-  -e "s;%BUG_CXXFLAGS%;\"${BUG_CXXFLAGS}\";" \
-  -e "s;%CC%;\"${CC}\";" \
-  -e "s;%CC_VERSION%;\"${CC_VERSION}\";" \
-  -e "s;%CFLAGS%;\"${BUG_CFLAGS}\";" \
-  -e "s;%CPICFLAG%;\"${CPICFLAG}\";" \
-  -e "s;%CPPFLAGS%;\"${CPPFLAGS}\";" \
-  -e "s;%CXX%;\"${CXX}\";" \
-  -e "s;%CXXFLAGS%;\"${CXXFLAGS}\";" \
-  -e "s;%CXXPICFLAG%;\"${CXXPICFLAG}\";" \
-  -e "s;%CXX_VERSION%;\"${CXX_VERSION}\";" \
-  -e "s;%F2C%;\"${F2C}\";" \
-  -e "s;%F2CFLAGS%;\"${F2CFLAGS}\";" \
-  -e "s;%F77%;\"${F77}\";" \
-  -e "s;%FFLAGS%;\"${FFLAGS}\";" \
-  -e "s;%FLIBS%;\"${FLIBS}\";" \
-  -e "s;%FPICFLAG%;\"${FPICFLAG}\";" \
-  -e "s;%INCFLAGS%;\"-I${octincludedir} -I${includedir}\";" \
-  -e "s;%LDFLAGS%;\"${LDFLAGS}\";" \
-  -e "s;%LEXLIB%;\"${LEXLIB}\";" \
-  -e "s;%LIBDLFCN%;\"${LIBDLFCN}\";" \
-  -e "s;%LIBGLOB%;\"${LIBGLOB}\";" \
-  -e "s;%LIBFLAGS%;\"-L${octlibdir}\";" \
-  -e "s;%LIBPLPLOT%;\"${LIBPLPLOT}\";" \
-  -e "s;%LIBS%;\"${LIBS}\";" \
-  -e "s;%RLD_FLAG%;\"${RLD_FLAG}\";" \
-  -e "s;%SH_LD%;\"${SH_LD}\";" \
-  -e "s;%SH_LDFLAGS%;\"${SH_LDFLAGS}\";" \
-  -e "s;%CANONICAL_HOST_TYPE%;\"${canonical_host_type}\";" \
-  -e "s;%TERMLIBS%;\"${TERMLIBS}\";" \
-  -e "s;%VERSION%;\"${version}\";" \
-  -e "s;%XTRA_CFLAGS%;\"${XTRA_CFLAGS}\";" \
-  -e "s;%XTRA_CXXFLAGS%;\"${XTRA_CXXFLAGS}\";" \
-  -e "s;%config_opts%;\"${config_opts}\";" | \
-  sed  -e "s;%DEFS%;\"${UGLY_DEFS}\";" > $@.tmp
+  -e "s;%OCTAVE_CONF_ALL_CFLAGS%;\"${ALL_CFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_ALL_CXXFLAGS%;\"${ALL_CXXFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_ALL_FFLAGS%;\"${ALL_FFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_ALL_LDFLAGS%;\"${ALL_LDFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_AR%;\"${AR}\";" \
+  -e "s;%OCTAVE_CONF_ARFLAGS%;\"${ARFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_CC%;\"${CC}\";" \
+  -e "s;%OCTAVE_CONF_CC_VERSION%;\"${CC_VERSION}\";" \
+  -e "s;%OCTAVE_CONF_CFLAGS%;\"${CFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_CPICFLAG%;\"${CPICFLAG}\";" \
+  -e "s;%OCTAVE_CONF_CPPFLAGS%;\"${CPPFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_CXX%;\"${CXX}\";" \
+  -e "s;%OCTAVE_CONF_CXXCPP%;\"${CXXCPP}\";" \
+  -e "s;%OCTAVE_CONF_CXXFLAGS%;\"${CXXFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_CXXPICFLAG%;\"${CXXPICFLAG}\";" \
+  -e "s;%OCTAVE_CONF_CXX_VERSION%;\"${CXX_VERSION}\";" \
+  -e "s;%OCTAVE_CONF_DEFAULT_PAGER%;\"${DEFAULT_PAGER}\";" \
+  -e "s;%OCTAVE_CONF_DLFCN_INCFLAGS%;\"${DLFCN_INCFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_EXE%;\"${EXE}\";" \
+  -e "s;%OCTAVE_CONF_F2C%;\"${F2C}\";" \
+  -e "s;%OCTAVE_CONF_F2CFLAGS%;\"${F2CFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_F77%;\"${F77}\";" \
+  -e "s;%OCTAVE_CONF_FC%;\"${FC}\";" \
+  -e "s;%OCTAVE_CONF_FFLAGS%;\"${FFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_FLIBS%;\"${FLIBS}\";" \
+  -e "s;%OCTAVE_CONF_FORTRAN_MAIN_FLAG%;\"${FORTRAN_MAIN_FLAG}\";" \
+  -e "s;%OCTAVE_CONF_FPICFLAG%;\"${FPICFLAG}\";" \
+  -e "s;%OCTAVE_CONF_GLOB_INCFLAGS%;\"${GLOB_INCFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_INCFLAGS%;\"${INCFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_LDFLAGS%;\"${LDFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_LD_STATIC_FLAG%;\"${LD_STATIC_FLAG}\";" \
+  -e "s;%OCTAVE_CONF_LEX%;\"${LEX}\";" \
+  -e "s;%OCTAVE_CONF_LEXLIB%;\"${LEXLIB}\";" \
+  -e "s;%OCTAVE_CONF_LFLAGS%;\"${LFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_LIBCRUFT%;\"${LIBCRUFT}\";" \
+  -e "s;%OCTAVE_CONF_LIBDLFCN%;\"${LIBDLFCN}\";" \
+  -e "s;%OCTAVE_CONF_LIBEXT%;\"${LIBEXT}\";" \
+  -e "s;%OCTAVE_CONF_LIBFLAGS%;\"${LIBFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_LIBGLOB%;\"${LIBGLOB}\";" \
+  -e "s;%OCTAVE_CONF_LIBKPATHSEA%;\"${LIBKPATHSEA}\";" \
+  -e "s;%OCTAVE_CONF_LIBOCTAVE%;\"${LIBOCTAVE}\";" \
+  -e "s;%OCTAVE_CONF_LIBOCTINTERP%;\"${LIBOCTINTERP}\";" \
+  -e "s;%OCTAVE_CONF_LIBPLPLOT%;\"${LIBPLPLOT}\";" \
+  -e "s;%OCTAVE_CONF_LIBREADLINE%;\"${LIBREADLINE}\";" \
+  -e "s;%OCTAVE_CONF_LIBS%;\"${LIBS}\";" \
+  -e "s;%OCTAVE_CONF_LN_S%;\"${LN_S}\";" \
+  -e "s;%OCTAVE_CONF_OCTAVE_LITE%;\"${OCTAVE_LITE}\";" \
+  -e "s;%OCTAVE_CONF_RANLIB%;\"${RANLIB}\";" \
+  -e "s;%OCTAVE_CONF_RDYNAMIC_FLAG%;\"${RDYNAMIC_FLAG}\";" \
+  -e "s;%OCTAVE_CONF_RLD_FLAG%;\"${RLD_FLAG}\";" \
+  -e "s;%OCTAVE_CONF_RUNTEST%;\"${RUNTEST}\";" \
+  -e "s;%OCTAVE_CONF_SHARED_LIBS%;\"${SHARED_LIBS}\";" \
+  -e "s;%OCTAVE_CONF_SHLEXT%;\"${SHLEXT}\";" \
+  -e "s;%OCTAVE_CONF_SHLEXT_VER%;\"${SHLEXT_VER}\";" \
+  -e "s;%OCTAVE_CONF_SH_LD%;\"${SH_LD}\";" \
+  -e "s;%OCTAVE_CONF_SH_LDFLAGS%;\"${SH_LDFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_SONAME_FLAGS%;\"${SONAME_FLAGS}\";" \
+  -e "s;%OCTAVE_CONF_SPECIAL_MATH_LIB%;\"${SPECIAL_MATH_LIB}\";" \
+  -e "s;%OCTAVE_CONF_STATIC_LIBS%;\"${STATIC_LIBS}\";" \
+  -e "s;%OCTAVE_CONF_TERMLIBS%;\"${TERMLIBS}\";" \
+  -e "s;%OCTAVE_CONF_UGLY_DEFS%;\"${UGLY_DEFS}\";" \
+  -e "s;%OCTAVE_CONF_VERSION%;\"${version}\";" \
+  -e "s;%OCTAVE_CONF_WITH_DL%;\"${WITH_DL}\";" \
+  -e "s;%OCTAVE_CONF_WITH_DYNAMIC_LINKING%;\"${WITH_DYNAMIC_LINKING}\";" \
+  -e "s;%OCTAVE_CONF_WITH_SHL%;\"${WITH_SHL}\";" \
+  -e "s;%OCTAVE_CONF_XTRA_CFLAGS%;\"${XTRA_CFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_XTRA_CXXFLAGS%;\"${XTRA_CXXFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_YACC%;\"${YACC}\";" \
+  -e "s;%OCTAVE_CONF_YFLAGS%;\"${YFLAGS}\";" \
+  -e "s;%OCTAVE_CONF_config_opts%;\"${config_opts}\";" | \
+  sed  -e "s;%OCTAVE_CONF_DEFS%;\"${UGLY_DEFS}\";" > $@.tmp
 $(top_srcdir)/move-if-change $@.tmp $@
 endef
 
 define do-subst-default-vals
 echo "making $@ from $<"
 sed < $< > $@.tmp \
-  -e "s;%DEFAULT_PAGER%;\"${DEFAULT_PAGER}\";" \
   -e "s;%OCTAVE_ARCHLIBDIR%;\"${archlibdir}\";" \
   -e "s;%OCTAVE_BINDIR%;\"${bindir}\";" \
+  -e "s;%OCTAVE_CANONICAL_HOST_TYPE%;\"${canonical_host_type}\";" \
   -e "s;%OCTAVE_DATADIR%;\"${datadir}\";" \
-  -e "s;%OCTAVE_LIBEXECDIR%;\"${libexecdir}\";" \
+  -e "s;%OCTAVE_DEFAULT_PAGER%;\"${DEFAULT_PAGER}\";" \
   -e "s;%OCTAVE_EXEC_PREFIX%;\"${exec_prefix}\";" \
   -e "s;%OCTAVE_FCNFILEDIR%;\"${fcnfiledir}\";" \
   -e "s;%OCTAVE_FCNFILEPATH%;\"${fcnfilepath}\";" \
+  -e "s;%OCTAVE_IMAGEDIR%;\"${imagedir}\";" \
   -e "s;%OCTAVE_IMAGEPATH%;\"${imagepath}\";" \
+  -e "s;%OCTAVE_INCLUDEDIR%;\"${includedir}\";" \
   -e "s;%OCTAVE_INFODIR%;\"${infodir}\";" \
   -e "s;%OCTAVE_INFOFILE%;\"${infofile}\";" \
   -e "s;%OCTAVE_LIBDIR%;\"${libdir}\";" \
-  -e "s;%OCTAVE_OCTLIBDIR%;\"${octlibdir}\";" \
+  -e "s;%OCTAVE_LIBEXECDIR%;\"${libexecdir}\";" \
   -e "s;%OCTAVE_LOCALARCHLIBDIR%;\"${localarchlibdir}\";" \
   -e "s;%OCTAVE_LOCALFCNFILEDIR%;\"${localfcnfiledir}\";" \
   -e "s;%OCTAVE_LOCALFCNFILEPATH%;\"${localfcnfilepath}\";" \
+  -e "s;%OCTAVE_LOCALOCTFILEDIR%;\"${localoctfiledir}\";" \
   -e "s;%OCTAVE_LOCALOCTFILEPATH%;\"${localoctfilepath}\";" \
+  -e "s;%OCTAVE_MAN1DIR%;\"${man1dir}\";" \
+  -e "s;%OCTAVE_MAN1EXT%;\"${man1ext}\";" \
+  -e "s;%OCTAVE_MANDIR%;\"${mandir}\";" \
   -e "s;%OCTAVE_OCTFILEDIR%;\"${octfiledir}\";" \
-  -e "s;%OCTAVE_PREFIX%;\"${prefix}\";" \
-  -e "s;%CANONICAL_HOST_TYPE%;\"${canonical_host_type}\";"
+  -e "s;%OCTAVE_OCTINCLUDEDIR%;\"${octincludedir}\";" \
+  -e "s;%OCTAVE_OCTLIBDIR%;\"${octlibdir}\";" \
+  -e "s;%OCTAVE_PREFIX%;\"${prefix}\";"
 $(top_srcdir)/move-if-change $@.tmp $@
 endef