Mercurial > hg > octave-lyh
changeset 5942:a02a305e06ee
[project @ 2006-08-18 18:57:06 by jwe]
author | jwe |
---|---|
date | Fri, 18 Aug 2006 18:57:06 +0000 |
parents | 117052c2b53c |
children | c038c2947ee1 |
files | ChangeLog Makeconf.in doc/ChangeLog doc/conf.texi.in doc/interpreter/var.txi |
diffstat | 5 files changed, 11 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -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,
--- a/Makeconf.in +++ b/Makeconf.in @@ -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
--- a/doc/ChangeLog +++ b/doc/ChangeLog @@ -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):
--- a/doc/conf.texi.in +++ b/doc/conf.texi.in @@ -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%
--- a/doc/interpreter/var.txi +++ b/doc/interpreter/var.txi @@ -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