Mercurial > hg > octave-max

changeset 2701:cd5f72e530e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 1997-02-19 19:15:40 by jwe]
author jwe
date Wed, 19 Feb 1997 19:16:17 +0000
parents f28ab98a2c07
children 7a820bb7f406
files doc/ChangeLog doc/Makefile.in doc/conf.texi doc/conf.texi.in doc/interpreter/Makefile.in doc/interpreter/basics.texi doc/interpreter/func.texi doc/interpreter/invoke.texi doc/interpreter/octave.texi doc/interpreter/system.texi doc/interpreter/var.texi doc/liboctave/Makefile.in doc/liboctave/liboctave.texi
diffstat 13 files changed, 87 insertions(+), 113 deletions(-) [+]
line wrap: on
line diff
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,15 @@
+Wed Feb 19 10:30:14 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
+
+	* Version 2.0.4 released.
+
+	* Makefile.in (DISTFILES): Distribute conf.texi, not conf.texi.in.
+
+	* liboctave/Makefile.in: Don't make or distribute conf.texi.
+	(liboctave.info, liboctave.dvi): Depend on ../conf.texi, not conf.texi.
+
+	* interpreter/Makefile.in: Don't create or distribute conf.texi.
+	(octave.info, octave.dvi): Depend on ../conf.texi, not conf.texi.
+
 Tue Feb 18 09:22:04 1997  John W. Eaton  <jwe@bevo.che.wisc.edu>
 
 	* Version 2.0.3 released.
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -20,7 +20,7 @@
 
 SOURCES =
 
-DISTFILES = Makefile.in ChangeLog conf.texi.in texinfo.tex 
+DISTFILES = Makefile.in ChangeLog conf.texi texinfo.tex 
 
 SUBDIRS = faq interpreter liboctave refcard
 
new file mode 100644
--- /dev/null
+++ b/doc/conf.texi
@@ -0,0 +1,7 @@
+@c Copyright (C) 1996 John W. Eaton
+@c This is part of the Octave manual.
+@c For copying conditions, see the file gpl.texi.
+
+@set VERSION 2.0.4
+@set OCTAVEHOME /usr/local
+@set TARGETHOSTTYPE i586-pc-linux-gnu
deleted file mode 100644
--- a/doc/conf.texi.in
+++ /dev/null
@@ -1,7 +0,0 @@
-@c Copyright (C) 1996 John W. Eaton
-@c This is part of the Octave manual.
-@c For copying conditions, see the file gpl.texi.
-
-@set VERSION %OCTAVE_VERSION%
-@set OCTAVEHOME %OCTAVE_HOME%
-@set TARGETHOSTTYPE %TARGET_HOST_TYPE%
--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -32,7 +32,7 @@
 
 FORMATTED = octave.dvi octave.ps octave.info octave.info-[0-9]*
 
-DISTFILES = Makefile.in dir octave.1 conf.texi $(TEXINFO) $(FORMATTED)
+DISTFILES = Makefile.in dir octave.1 $(TEXINFO) $(FORMATTED)
 
 ifeq ($(wildcard octave.info), )
   BINDISTFILES = $(srcdir)/octave.1 $(srcdir)/octave.info \
@@ -53,34 +53,13 @@
 	sed -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@.tmp
 	mv $@.tmp $@
 
-all: conf.texi octave.info octave.dvi octave.ps
+all: octave.info octave.dvi octave.ps
 .PHONY: all
 
-# This mess is supposed to prevent us from making info files
-# unnecessarily when building Octave in a subdirectory.
-
-conf.texi: $(srcdir)/../../src/version.h ../../Makeconf Makefile \
-	$(srcdir)/../conf.texi.in
-	@echo "Making conf.texi from conf.texi.in..."
-	sed < $(srcdir)/../conf.texi.in > conf.texi.tmp \
-	  -e "s;%OCTAVE_VERSION%;${version};" \
-	  -e "s;%TARGET_HOST_TYPE%;${target_host_type};" \
-	  -e "s;%OCTAVE_HOME%;${prefix};"
-	@if test "$(srcdir)" = "." ; then \
-	  $(top_srcdir)/move-if-change conf.texi.tmp conf.texi; \
-	else \
-	  if cmp conf.texi.tmp $(srcdir)/conf.texi > /dev/null; then \
-	    echo conf.texi is unchanged; \
-	    rm -f conf.texi.tmp; \
-	  else \
-	    mv -f conf.texi.tmp conf.texi; \
-	  fi; \
-	fi
-
-octave.info: $(TEXINFO) conf.texi
+octave.info: $(TEXINFO) ../conf.texi
 	-makeinfo -I$(srcdir) $(srcdir)/octave.texi
 
-octave.dvi: $(TEXINFO) conf.texi
+octave.dvi: $(TEXINFO) ../conf.texi
 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \
 	  export TEXINPUTS ; \
 	  $(TEXI2DVI) $(srcdir)/octave.texi
--- a/doc/interpreter/basics.texi
+++ b/doc/interpreter/basics.texi
@@ -252,20 +252,20 @@
 @cindex startup files
 
 @table @code
-@item OCTAVE_HOME/share/octave/site/m/startup/octaverc
-Where @code{OCTAVE_HOME} is the directory in which all of Octave is
-installed (the default is @file{/usr/local}).  This file is provided so
-that changes to the default Octave environment can be made globally for
-all users at your site for all versions of Octave you have installed.
-Some care should be taken when making changes to this file, since all
-users of Octave at your site will be affected.
+@item @var{OCTAVE_HOME}/share/octave/site/m/startup/octaverc
+Where @var{OCTAVE_HOME} is the directory in which all of Octave is
+installed (the default is @file{@value{OCTAVEHOME}}).  This file is
+provided so that changes to the default Octave environment can be made
+globally for all users at your site for all versions of Octave you have
+installed.  Some care should be taken when making changes to this file,
+since all users of Octave at your site will be affected.
 
-@item OCTAVE_HOME/share/octave/VERSION/m/startup/octaverc
-Where @code{OCTAVE_HOME} is the directory in which all of Octave is
-installed (the default is @file{/usr/local}), and @code{VERSION} is the
-version number of Octave.  This file is provided so that changes to the
-default Octave environment can be made globally for all users for a
-particular version of Octave.  Some care should be taken when making
+@item @var{OCTAVE_HOME}/share/octave/@var{VERSION}/m/startup/octaverc
+Where @var{OCTAVE_HOME} is the directory in which all of Octave is
+installed (the default is @file{@value{OCTAVEHOME}}), and @var{VERSION}
+is the version number of Octave.  This file is provided so that changes
+to the default Octave environment can be made globally for all users for
+a particular version of Octave.  Some care should be taken when making
 changes to this file, since all users of Octave at your site will be
 affected.
 
@@ -358,16 +358,19 @@
 
 @defvr {Built-in Variable} INFO_FILE
 The variable @code{INFO_FILE} names the location of the Octave info file.
-The default value is @code{"@value{OCTAVEHOME}/info/octave.info"}.
+The default value is @code{"@var{OCTAVE_HOME}/info/octave.info"}, where
+@var{OCTAVE_HOME} is the directory where all of Octave is installed.
 @end defvr
 
 @defvr {Built-in Variable} INFO_PROGRAM
 The variable @code{INFO_PROGRAM} names the info program to run.  Its
 initial value is
-@code{@value{OCTAVEHOME}/libexec/octave/VERSION/exec/ARCH/info}, but
-that value can be overridden by the environment variable
-@code{OCTAVE_INFO_PROGRAM}, or the command line argument
-@code{--info-program NAME}, or by setting the value of
+@code{"@var{OCTAVE_HOME}/libexec/octave/@var{VERSION}/exec/@var{ARCH}/info"},
+where @var{OCTAVE_HOME} is the directory where all of Octave is
+installed, @var{VERSION} is the Octave version number, and @var{ARCH} is
+the machine type.  The value of @code{INFO_PROGRAM} can be overridden by
+the environment variable @code{OCTAVE_INFO_PROGRAM}, or the command line
+argument @code{--info-program NAME}, or by setting the value of
 @code{INFO_PROGRAM} in a startup script.
 @end defvr
 
@@ -1011,15 +1014,16 @@
 
 @example
 @group
-#! @value{OCTAVEHOME}/bin/octave -qf
+#! /path/to/octave -qf
 # a sample Octave program
 printf ("Hello, world!\n");
 @end group
 @end example
 
 @noindent
-After making this file executable (with the @code{chmod} command), you
-can simply type:
+(where @code{/path/to/octave} should be replaced with the full file name
+for your Octave binary).  After making this file executable (with the
+@code{chmod} command), you can simply type:
 
 @example
 hello
@@ -1058,7 +1062,7 @@
 
 @example
 @group
-#! @value{OCTAVEHOME}/bin/octave -qf
+#! /bin/octave -qf
 printf ("%s", program_name);
 for i = 1:nargin
   printf (" %s", argv(i,:));
--- a/doc/interpreter/func.texi
+++ b/doc/interpreter/func.texi
@@ -611,8 +611,8 @@
 To avoid degrading performance unnecessarily by checking the time stamps
 on functions that are not likely to change, Octave assumes that function
 files in the directory tree
-@file{@value{OCTAVEHOME}/share/octave/@value{VERSION}/m} will not
-change, so it doesn't have to check their time stamps every time the
+@file{@var{OCTAVE_HOME}/share/octave/@var{VERSION}/m}
+will not change, so it doesn't have to check their time stamps every time the
 functions defined in those files are used.  This is normally a very good
 assumption and provides a significant improvement in performance for the
 function files that are distributed with Octave.
@@ -657,14 +657,14 @@
 @code{stat} each time it looks up functions defined in function files.
 If @code{ignore_function_time_stamp} to @code{"system"}, Octave will not
 automatically recompile function files in subdirectories of
-@file{@value{OCTAVEHOME}/lib/@value{VERSION}} if they have changed since
+@file{@var{OCTAVE_HOME}/lib/@var{VERSION}} if they have changed since
 they were last compiled, but will recompile other function files in the
 @code{LOADPATH} if they change.  If set to @code{"all"}, Octave will not
 recompile any function files unless their definitions are removed with
 @code{clear}.  For any other value of @code{ignore_function_time_stamp},
 Octave will always check to see if functions defined in function files
-need to recompiled.  The default value of
-@code{ignore_function_time_stamp} is @code{"system"}.
+need to recompiled.  The default value of @code{ignore_function_time_stamp} is
+@code{"system"}.
 @end defvr
 
 @defvr {Built-in Variable} warn_function_name_clash
@@ -984,8 +984,8 @@
 
 Many of Octave's standard functions are distributed as function files.
 They are loosely organized by topic, in subdirectories of
-@file{OCTAVE_HOME/lib/octave/VERSION/m}, to make it easier to find
-them.
+@file{@var{OCTAVE_HOME}/lib/octave/@var{VERSION}/m}, to make it easier
+to find them.
 
 The following is a list of all the function file subdirectories, and the
 types of functions you will find there.
--- a/doc/interpreter/invoke.texi
+++ b/doc/interpreter/invoke.texi
@@ -241,22 +241,22 @@
 @cindex startup files
 
 @table @code
-@item OCTAVE_HOME/share/octave/site/m/startup/octaverc
-Where @code{OCTAVE_HOME} is the directory in which all of Octave is
-installed (the default is @file{/usr/local}).  This file is provided so
-that changes to the default Octave environment can be made globally for
-all users at your site for all versions of Octave you have installed.
-Some care should be taken when making changes to this file, since all
-users of Octave at your site will be affected.
+@item @var{OCTAVE_HOME}/share/octave/site/m/startup/octaverc
+Where @var{OCTAVE_HOME} is the directory in which all of Octave is
+installed (the default is @file{@value{OCTAVEHOME}}).  This file is
+provided so that changes to the default Octave environment can be made
+globally for all users at your site for all versions of Octave you have
+installed.  Some care should be taken when making changes to this file,
+since all users of Octave at your site will be affected.
 
-@item OCTAVE_HOME/share/octave/VERSION/m/startup/octaverc
+@item @var{OCTAVE_HOME}/share/octave/@var{VERSION}/m/startup/octaverc
 Where @code{OCTAVE_HOME} is the directory in which all of Octave is
-installed (the default is @file{/usr/local}), and @code{VERSION} is the
-version number of Octave.  This file is provided so that changes to the
-default Octave environment can be made globally for all users for a
-particular version of Octave.  Some care should be taken when making
-changes to this file, since all users of Octave at your site will be
-affected.
+installed (the default is @file{@value{OCTAVE_HOME}}), and
+@var{VERSION} is the version number of Octave.  This file is provided
+so that changes to the default Octave environment can be made globally
+for all users for a particular version of Octave.  Some care should be
+taken when making changes to this file, since all users of Octave at
+your site will be affected.
 
 @item ~/.octaverc
 @cindex @code{~/.octaverc}
--- a/doc/interpreter/octave.texi
+++ b/doc/interpreter/octave.texi
@@ -36,7 +36,7 @@
 @c This file doesn't include a chapter, so it must not be included
 @c if you want to run the Emacs function texinfo-multiple-files-update.
 
-@include conf.texi
+@include ../conf.texi
 
 @settitle Octave
 
--- a/doc/interpreter/system.texi
+++ b/doc/interpreter/system.texi
@@ -794,17 +794,17 @@
 
 @example
 @group
-OCTAVE_HOME/libexec/octave/site/exec/ARCH
-OCTAVE_HOME/libexec/octave/VERSION/exec/ARCH
+@var{OCTAVE_HOME}/libexec/octave/site/exec/@var{ARCH}
+@var{OCTAVE_HOME}/libexec/octave/@var{VERSION}/exec/@var{ARCH}
 @end group
 @end example
 
 @noindent
-are prepended (appended) to @code{EXEC_PATH}, where @code{OCTAVE_HOME}
+are prepended (appended) to @code{EXEC_PATH}, where @var{OCTAVE_HOME}
 is the top-level directory where all of Octave is installed
-(@file{/usr/local} by default).  If you don't specify a value for
-@code{EXEC_PATH} explicitly, these special directories are prepended to
-your shell path.
+(the default value is @file{@value{OCTAVEHOME}}).  If you don't specify
+a value for @code{EXEC_PATH} explicitly, these special directories are
+prepended to your shell path.
 @end defvr
 
 In most cases, the following functions simply decode their arguments and
--- a/doc/interpreter/var.texi
+++ b/doc/interpreter/var.texi
@@ -282,10 +282,10 @@
 Here is a summary of all of Octave's built-in variables along with
 cross references to additional information and their default values.  In
 the following table @code{OCT_HOME} stands for the root directory where
-Octave is installed (for example, @file{@value{OCTAVEHOME}}, @code{VERSION}
-stands for the Octave version number (for example, @value{VERSION}, and
-@code{SYS} stands for the type of system for which Octave was compiled
-(for example, @code{@value{TARGETHOSTTYPE}}).
+all of Octave is installed (the default is @file{@value{OCTAVEHOME}},
+@code{VERSION} stands for the Octave version number (for example,
+@value{VERSION}, and @code{SYS} stands for the type of system for which
+Octave was compiled (for example, @code{@value{TARGETHOSTTYPE}}).
 
 @vtable @code
 @item EDITOR
--- a/doc/liboctave/Makefile.in
+++ b/doc/liboctave/Makefile.in
@@ -27,7 +27,7 @@
 
 FORMATTED = liboctave.dvi liboctave.ps liboctave.info liboctave.info-[0-9]*
 
-DISTFILES = Makefile.in conf.texi gpl.texi $(TEXINFO) $(FORMATTED)
+DISTFILES = Makefile.in gpl.texi $(TEXINFO) $(FORMATTED)
 
 BINDISTFILES =
 
@@ -38,34 +38,13 @@
 	sed -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@.tmp
 	mv $@.tmp $@
 
-all: conf.texi liboctave.info liboctave.dvi liboctave.ps
+all: liboctave.info liboctave.dvi liboctave.ps
 .PHONY: all
 
-# This mess is supposed to prevent us from making info files
-# unnecessarily when building Octave in a subdirectory.
-
-conf.texi: $(srcdir)/../../src/version.h ../../Makeconf Makefile \
-	$(srcdir)/../conf.texi.in
-	@echo "Making conf.texi from conf.texi.in..."
-	@(version_val=${version}; \
-	sed < $(srcdir)/../conf.texi.in > conf.texi.tmp \
-	-e "s;%OCTAVE_VERSION%;$$version_val;" \
-	-e "s;%OCTAVE_HOME%;${prefix};")
-	@if test "$(srcdir)" = "." ; then \
-	  $(top_srcdir)/move-if-change conf.texi.tmp conf.texi; \
-	else \
-	  if cmp conf.texi.tmp $(srcdir)/conf.texi > /dev/null; then \
-	    echo conf.texi is unchanged; \
-	    rm -f conf.texi.tmp; \
-	  else \
-	    mv -f conf.texi.tmp conf.texi; \
-	  fi; \
-	fi
-
-liboctave.info: $(TEXINFO) conf.texi
+liboctave.info: $(TEXINFO) ../conf.texi
 	-makeinfo -I$(srcdir) $(srcdir)/liboctave.texi
 
-liboctave.dvi: $(TEXINFO) conf.texi
+liboctave.dvi: $(TEXINFO) ../conf.texi
 	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" ; \
 	  export TEXINPUTS ; \
 	  $(TEXI2DVI) $(srcdir)/liboctave.texi
--- a/doc/liboctave/liboctave.texi
+++ b/doc/liboctave/liboctave.texi
@@ -24,7 +24,7 @@
 
 @defindex op
 
-@c @include conf.texi
+@include ../conf.texi
 
 @settitle Octave C++ Classes