Mercurial > hg > octave-lyh
changeset 3234:be8e0ba13644
[project @ 1999-01-29 03:52:30 by jwe]
author | jwe |
---|---|
date | Fri, 29 Jan 1999 03:52:33 +0000 |
parents | 98d0ee053ba4 |
children | 41602f25d19f |
files | ChangeLog Makeconf.in src/ChangeLog src/defaults.h.in src/sysdep.cc src/toplev.cc src/version.h |
diffstat | 7 files changed, 31 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +Thu Jan 28 21:05:32 1999 John W. Eaton <jwe@bevo.che.wisc.edu> + + * Makeconf.in (do-subst-config-vals): Do substitution on + CANONICAL_HOST_TYPE, not TARGET_HOST_TYPE. + (do-subst-default-vals): Likewise. + Wed Jan 20 12:56:02 1999 John W. Eaton <jwe@bevo.che.wisc.edu> * configure.in: Don't put -O in FFLAGS for powerpc-apple-machten*.
--- a/Makeconf.in +++ b/Makeconf.in @@ -342,7 +342,7 @@ -e "s;%RLD_FLAG%;\"${RLD_FLAG}\";" \ -e "s;%SH_LD%;\"${SH_LD}\";" \ -e "s;%SH_LDFLAGS%;\"${SH_LDFLAGS}\";" \ - -e "s;%TARGET_HOST_TYPE%;\"${canonical_host_type}\";" \ + -e "s;%CANONICAL_HOST_TYPE%;\"${canonical_host_type}\";" \ -e "s;%TERMLIBS%;\"${TERMLIBS}\";" \ -e "s;%VERSION%;\"${version}\";" \ -e "s;%XTRA_CFLAGS%;\"${XTRA_CFLAGS}\";" \ @@ -374,7 +374,7 @@ -e "s;%OCTAVE_LOCALOCTFILEPATH%;\"${localoctfilepath}\";" \ -e "s;%OCTAVE_OCTFILEDIR%;\"${octfiledir}\";" \ -e "s;%OCTAVE_PREFIX%;\"${prefix}\";" \ - -e "s;%TARGET_HOST_TYPE%;\"${canonical_host_type}\";" + -e "s;%CANONICAL_HOST_TYPE%;\"${canonical_host_type}\";" $(top_srcdir)/move-if-change $@.tmp $@ endef
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,11 @@ +Thu Jan 28 21:29:16 1999 John W. Eaton <jwe@bevo.che.wisc.edu> + + * toplev.cc (Fcomputer): Use CANONICAL_HOST_TYPE, not TARGET_HOST_TYPE. + (octave_config_info): Likewise. + * version.h: Ditto. + + * sysdep.cc (Fpause): Flush output before getting user input. + Wed Jan 27 14:18:29 1999 John W. Eaton <jwe@bevo.che.wisc.edu> * Makefile.in (DEFFUN_PATTERN, DEFVAR_PATTERN): Use egrep again.
--- a/src/defaults.h.in +++ b/src/defaults.h.in @@ -112,8 +112,8 @@ #define OCTAVE_IMAGEPATH %OCTAVE_IMAGEPATH% #endif -#ifndef TARGET_HOST_TYPE -#define TARGET_HOST_TYPE %TARGET_HOST_TYPE% +#ifndef CANONICAL_HOST_TYPE +#define CANONICAL_HOST_TYPE %CANONICAL_HOST_TYPE% #endif extern string Voctave_home;
--- a/src/sysdep.cc +++ b/src/sysdep.cc @@ -75,6 +75,7 @@ #include "input.h" #include "oct-obj.h" #include "ov.h" +#include "pager.h" #include "sysdep.h" #include "toplev.h" #include "utils.h" @@ -414,7 +415,10 @@ if (xisnan (dval)) warning ("pause: NaN is an invalid delay"); else if (xisinf (dval)) - kbhit (); + { + flush_octave_stdout (); + kbhit (); + } else { int delay = NINT (dval); @@ -424,7 +428,10 @@ } } else - kbhit (); + { + flush_octave_stdout (); + kbhit (); + } return retval; }
--- a/src/toplev.cc +++ b/src/toplev.cc @@ -210,10 +210,10 @@ string msg; - if (strcmp (TARGET_HOST_TYPE, "unknown") == 0) + if (strcmp (CANONICAL_HOST_TYPE, "unknown") == 0) msg = "Hi Dave, I'm a HAL-9000"; else - msg = TARGET_HOST_TYPE; + msg = CANONICAL_HOST_TYPE; if (nargout == 0) octave_stdout << msg << "\n"; @@ -591,7 +591,7 @@ m ["localoctfilepath"] = OCTAVE_LOCALOCTFILEPATH; m ["fcnfilepath"] = OCTAVE_FCNFILEPATH; m ["imagepath"] = OCTAVE_IMAGEPATH; - m ["canonical_host_type"] = TARGET_HOST_TYPE; + m ["canonical_host_type"] = CANONICAL_HOST_TYPE; m ["configure_options"] = config_opts; m ["F77"] = F77; m ["FFLAGS"] = FFLAGS;
--- a/src/version.h +++ b/src/version.h @@ -29,7 +29,7 @@ "Copyright (C) 1996, 1997, 1998 John W. Eaton." #define OCTAVE_NAME_AND_VERSION \ - "Octave, version " OCTAVE_VERSION " (" TARGET_HOST_TYPE ")" + "Octave, version " OCTAVE_VERSION " (" CANONICAL_HOST_TYPE ")" #define OCTAVE_NAME_VERSION_AND_COPYRIGHT \ OCTAVE_NAME_AND_VERSION ".\n" OCTAVE_COPYRIGHT "\n\