# HG changeset patch
# User jwe
# Date 1155927426 0
# Node ID a02a305e06ee8f5a308bdb9bb72700f934b3fafe
# Parent  117052c2b53c7b20d32794a117b51f9531f61ddc
[project @ 2006-08-18 18:57:06 by jwe]

diff -r 117052c2b53c -r a02a305e06ee ChangeLog
--- a/ChangeLog	Fri Aug 18 18:05:20 2006 +0000
+++ b/ChangeLog	Fri Aug 18 18:57:06 2006 +0000
@@ -1,3 +1,8 @@
+2006-08-18  John W. Eaton  <jwe@octave.org>
+
+	* Makeconf.in (do-subst-texinfo-vals): Don't substitute
+	%CANONICAL_HOST_TYPE%.
+
 2006-08-17  John W. Eaton  <jwe@octave.org>
 
 	* aclocal.m4 (OCTAVE_PROG_GHOSTSCRIPT, OCTAVE_PROG_MAKEINFO,
diff -r 117052c2b53c -r a02a305e06ee Makeconf.in
--- a/Makeconf.in	Fri Aug 18 18:05:20 2006 +0000
+++ b/Makeconf.in	Fri Aug 18 18:57:06 2006 +0000
@@ -541,13 +541,12 @@
 define do-subst-texinfo-vals
 echo "making $@ from $<"
 $(SED) < $< \
-  -e "s|%CANONICAL_HOST_TYPE%|${canonical_host_type}|" \
   -e "s|%OCTAVE_HOME%|${prefix}|" \
   -e "s|%OCTAVE_VERSION%|${version}|" \
   -e "s|%TEXINFO_COLAMD%|${TEXINFO_COLAMD}|" \
   -e "s|%TEXINFO_CHOLMOD%|${TEXINFO_CHOLMOD}|" \
   -e "s|%TEXINFO_UMFPACK%|${TEXINFO_UMFPACK}|" | \
-  $(SED)  -e "s|%OCTAVE_CONF_DEFS%|\"${UGLY_DEFS}\"|" > $@-t
+  $(SED) -e "s|%OCTAVE_CONF_DEFS%|\"${UGLY_DEFS}\"|" > $@-t
 $(top_srcdir)/move-if-change $@-t $@
 endef
 
diff -r 117052c2b53c -r a02a305e06ee doc/ChangeLog
--- a/doc/ChangeLog	Fri Aug 18 18:05:20 2006 +0000
+++ b/doc/ChangeLog	Fri Aug 18 18:57:06 2006 +0000
@@ -1,3 +1,7 @@
+2006-08-18  John W. Eaton  <jwe@octave.org>
+
+	* conf.texi.in: Eliminate TARGETHOSTTYPE variable.
+
 2006-08-17  John W. Eaton  <jwe@octave.org>
 
 	* interpreter/images/Makefile.in (%.pdf : %eps):
diff -r 117052c2b53c -r a02a305e06ee doc/conf.texi.in
--- a/doc/conf.texi.in	Fri Aug 18 18:05:20 2006 +0000
+++ b/doc/conf.texi.in	Fri Aug 18 18:57:06 2006 +0000
@@ -3,7 +3,6 @@
 @c For copying conditions, see the file gpl.texi.
 
 @set OCTAVE_MANUAL
-@set TARGETHOSTTYPE %CANONICAL_HOST_TYPE%
 @set OCTAVEHOME %OCTAVE_HOME%
 @set VERSION %OCTAVE_VERSION%
 %TEXINFO_COLAMD%
diff -r 117052c2b53c -r a02a305e06ee doc/interpreter/var.txi
--- a/doc/interpreter/var.txi	Fri Aug 18 18:05:20 2006 +0000
+++ b/doc/interpreter/var.txi	Fri Aug 18 18:57:06 2006 +0000
@@ -224,7 +224,7 @@
 where all of Octave is installed (the default is @file{@value{OCTAVEHOME}},
 @var{version} stands for the Octave version number (for example,
 @value{VERSION}) and @var{arch} stands for the type of system for which
-Octave was compiled (for example, @code{@value{TARGETHOSTTYPE}}).
+Octave was compiled (for example, @code{x86_64-unknown-linux-gnu}).
 
 @vtable @code
 @item DEFAULT_LOADPATH