changeset 3768:243148f6c91c

[project @ 2001-01-29 18:05:34 by jwe]
author jwe
date Mon, 29 Jan 2001 18:05:34 +0000
parents f0e7c832e0e2
children 7c8e3c42ed04
files ChangeLog Makeconf.in octave-bug.in
diffstat 3 files changed, 9 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Jan 29 16:32:08 2001 +0000
+++ b/ChangeLog	Mon Jan 29 18:05:34 2001 +0000
@@ -1,3 +1,10 @@
+2001-01-29  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Makeconf.in (do-subst-config-vals): Substitute
+	OCTAVE_CONF_CANONICAL_HOST_TYPE here too.
+	* octave-bug.in: Substitute OCTAVE_CONF_CANONICAL_HOST_TYPE, not
+	OCTAVE_CANONICAL_HOST_TYPE.
+
 2000-12-09  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* aclocal.m4: Give gperf a keyword, to avoid complaints from newer
--- a/Makeconf.in	Mon Jan 29 16:32:08 2001 +0000
+++ b/Makeconf.in	Mon Jan 29 18:05:34 2001 +0000
@@ -335,6 +335,7 @@
   -e "s;%OCTAVE_CONF_AR%;\"${AR}\";" \
   -e "s;%OCTAVE_CONF_ARFLAGS%;\"${ARFLAGS}\";" \
   -e "s;%OCTAVE_CONF_BLAS_LIBS%;\"${BLAS_LIBS}\";" \
+  -e "s;%OCTAVE_CONF_CANONICAL_HOST_TYPE%;\"${canonical_host_type}\";" \
   -e "s;%OCTAVE_CONF_CC%;\"${CC}\";" \
   -e "s;%OCTAVE_CONF_CC_VERSION%;\"${CC_VERSION}\";" \
   -e "s;%OCTAVE_CONF_CFLAGS%;\"${CFLAGS}\";" \
--- a/octave-bug.in	Mon Jan 29 16:32:08 2001 +0000
+++ b/octave-bug.in	Mon Jan 29 18:05:34 2001 +0000
@@ -15,7 +15,7 @@
 
 config_opts=%OCTAVE_CONF_config_opts%
 VERSION=%OCTAVE_CONF_VERSION%
-MACHINE=%OCTAVE_CANONICAL_HOST_TYPE%
+MACHINE=%OCTAVE_CONF_CANONICAL_HOST_TYPE%
 F77=%OCTAVE_CONF_F77%
 FFLAGS=%OCTAVE_CONF_FFLAGS%
 FPICFLAG=%OCTAVE_CONF_FPICFLAG%