# HG changeset patch
# User jwe
# Date 950004546 0
# Node ID a31ee5c3b66c5d510eaf6b204cb82e1c54d12fdc
# Parent  4ade6278d401a72118071fca3ddea195700eb0a7
[project @ 2000-02-08 10:09:05 by jwe]

diff -r 4ade6278d401 -r a31ee5c3b66c ChangeLog
--- a/ChangeLog	Tue Feb 08 09:00:12 2000 +0000
+++ b/ChangeLog	Tue Feb 08 10:09:06 2000 +0000
@@ -1,3 +1,8 @@
+2000-02-08  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* mkoctfile.in: Fix names in substititions.
+	* octave-bug.in: Likewise.
+
 2000-02-07  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Makeconf.in (do-subst-default-vals, do-subst-config-vals):
diff -r 4ade6278d401 -r a31ee5c3b66c mkoctfile.in
--- 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"}
 
diff -r 4ade6278d401 -r a31ee5c3b66c octave-bug.in
--- a/octave-bug.in	Tue Feb 08 09:00:12 2000 +0000
+++ b/octave-bug.in	Tue Feb 08 10:09:06 2000 +0000
@@ -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}