Mercurial > hg > octave-lyh
changeset 2646:5adf5280858c
[project @ 1997-01-29 18:59:41 by jwe]
| author | jwe |
|---|---|
| date | Wed, 29 Jan 1997 19:00:11 +0000 |
| parents | 8fbc52dfc4c3 |
| children | 044ff6e8b739 |
| files | src/ChangeLog src/Makefile.in src/pager.cc |
| diffstat | 3 files changed, 29 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,5 +1,15 @@ Wed Jan 29 08:25:29 1997 John W. Eaton <jwe@bevo.che.wisc.edu> + * pager.cc (do_sync): Flush the cout stream after writing if + running in interactive or forced_interactive mode. + + * mk-oct-links: Rename from mk-oct-links.in. + Don't use symbolic links. + * Makefile.in: Distribute mk-oct-links, not mk-oct-links.in + (mk-oct-links): Delete target. + (install-oct, bin-dist): Don't depend on mk-oct-links. + Run $(srcdir)/mk-oct-links, not ./mk-oct-links. + * qr.cc (qr): Doc fix. Tue Jan 28 10:48:28 1997 John W. Eaton <jwe@bevo.che.wisc.edu>
--- a/src/Makefile.in +++ b/src/Makefile.in @@ -165,7 +165,7 @@ LIBS = @LIBS@ -DISTFILES = Makefile.in ChangeLog mkdefs mkbuiltins mk-oct-links.in \ +DISTFILES = Makefile.in ChangeLog mkdefs mkbuiltins mk-oct-links \ defaults.h.in oct-conf.h.in octave.gperf oct-gperf.h \ octave.cc parse.cc lex.cc y.tab.h \ $(INCLUDES) $(DLD_SRC) $(SOURCES) $(TI_SRC) @@ -253,12 +253,6 @@ install: install-bin install-oct install-lib install-inc .PHONY: install -mk-oct-links: mk-oct-links.in - sed < $< > $@.tmp \ - -e "s;%LN_S%;${LN_S};" - $(top_srcdir)/move-if-change $@.tmp $@ - chmod a+rx mk-oct-links - install-bin: $(top_srcdir)/mkinstalldirs $(bindir) rm -f $(bindir)/octave$(EXE) @@ -266,14 +260,15 @@ cd $(bindir) ; $(LN_S) octave-$(version)$(EXE) octave$(EXE) .PHONY: install-bin -install-oct: mk-oct-links +install-oct: if [ -n "$(OCT_FILES)" ]; then \ $(top_srcdir)/mkinstalldirs $(octfiledir) ; \ xfiles="$(OCT_FILES)" ; \ for f in $$xfiles ; do \ $(INSTALL_PROGRAM) $$f $(octfiledir)/$$f; \ done ; \ - ./mk-oct-links $(octfiledir) $(addprefix $(srcdir)/, $(DLD_SRC)) ; \ + $(srcdir)/mk-oct-links \ + $(octfiledir) $(addprefix $(srcdir)/, $(DLD_SRC)) ; \ fi .PHONY: install-oct @@ -337,7 +332,7 @@ .PHONY: mostlyclean distclean: clean - rm -f Makefile octave .fname so_locations mk-oct-links + rm -f Makefile octave .fname so_locations rm -f stamp-picdir stamp-tinst stamp-interp stamp-prereq -rmdir pic .PHONY: distclean @@ -358,12 +353,12 @@ ln octave.cc Makefile.in ../`cat ../.fname`/src .PHONY: conf-dist -bin-dist: mk-oct-links +bin-dist: if [ -n "$(BINDISTFILES)" ]; then \ ln $(BINDISTFILES) ../`cat ../.fname`/src ; \ fi if [ -n "$(OCT_FILES)" ]; then \ - ./mk-oct-links -p $(octfiledir) \ + $(srcdir)/mk-oct-links -p $(octfiledir) \ $(addprefix $(srcdir)/, $(DLD_SRC)) \ > ../`cat ../.fname`/src/links-to-make ; \ fi
--- a/src/pager.cc +++ b/src/pager.cc @@ -127,7 +127,12 @@ if (msg && *msg) { if (bypass_pager) - cout << msg; + { + cout << msg; + + if (interactive || forced_interactive) + cout.flush (); + } else { if (! external_pager) @@ -167,7 +172,12 @@ } } else - cout << msg; + { + cout << msg; + + if (interactive || forced_interactive) + cout.flush (); + } } } }