11 files changed, 108 insertions, 285 deletions

diff --git a/Makefile.in b/Makefile.in
index 4f20689e..e03689be 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,16 +1,12 @@
 
 ## ----------------------------------------
-## -- Old-style Axiom makefile variables --
+## -- Old-style OpenAxiom makefile variables --
 ## ----------------------------------------
 
 GCLOPTS=@GCLOPTS@
 
 pamphlets = configure.ac.pamphlet Makefile.pamphlet
 
-PART=	cprogs
-SUBPART= everything
-
-
 
 subdir = 
 
@@ -53,34 +49,14 @@ $(axiom_build_bindir)/gcl$(EXEEXT):
 	fi; cd gcl; \
 	./configure --prefix=$(axiom_abs_builddir) ${GCLOPTS} && \
 		$(MAKE) && $(MAKE) install
-book:
-	@ echo 79 building the book as $(axiom_target_docdir)/book.dvi 
-	@ mkdir -p ${TMP}
-	@ mkdir -p $(axiom_target_docdir)
-	@ $(INSTALL) $(axiom_src_docdir)/book.pamphlet $(axiom_target_docdir)
-	@ cp -pr $(axiom_src_docdir)/ps $(axiom_target_docdir)
-	@ (cd $(axiom_target_docdir) ; \
-          if [ .${NOISE} = . ] ; then \
-	    ( latex book.pamphlet --interaction nonstopmode ; \
-	      latex book.pamphlet --interaction nonstopmode ) ; \
-	   else \
-	    ( latex book.pamphlet --interaction nonstopmode >${TMP}/trace ; \
-	      latex book.pamphlet --interaction nonstopmode >${TMP}/trace ) ; \
-	  fi ; \
-	  rm book.pamphlet ; \
-	  rm book.toc ; \
-	  rm book.log ; \
-	  rm book.aux )
-	@ echo 80 The book is at $(axiom_target_docdir)/book.dvi 
-
 install:
-	@echo Installing Axiom in $(prefix)
-	@mkdir -p $(DESTDIR)$(libdir)/axiom
-	@cp -pr $(builddir)/target $(DESTDIR)$(libdir)/axiom
+	@echo Installing OpenAxiom in $(prefix)
+	@mkdir -p $(DESTDIR)$(libdir)/open-axiom
+	@cp -pr $(builddir)/target $(DESTDIR)$(libdir)/open-axiom
 	@ rm -f $(bindir)/axiom
 	@ $(mkinstalldirs) $(bindir)
 	@ $(INSTALL_PROGRAM) src/scripts/axiom $(bindir)
-	@echo Axiom installation finished.
+	@echo OpenAxiom installation finished.
 
 mostlyclean-local:
 	@-rm -f lastBuildDate
diff --git a/Makefile.pamphlet b/Makefile.pamphlet
index 5bae8b94..68629a00 100644
--- a/Makefile.pamphlet
+++ b/Makefile.pamphlet
@@ -3,7 +3,7 @@
 \usepackage{axiom}
 
 \title{The Top Level \File{Makefile}}
-\author{Timothy Daly \and Gabriel Dos~Reis}
+\author{Gabriel Dos~Reis \and Timothy Daly}
 
 \begin{document}
 \maketitle
@@ -18,36 +18,36 @@
 \section{General Makefile Structure}
 \label{sec:general-structure}
 
-All the Makfiles in the \Tool{Axiom} build systen are structured in very
+All the Makfiles in the \Tool{OpenAxiom} build systen are structured in very
 similar ways.  First, they have to build all of the files
 in their own directory. Second, they have to invoke \Tool{Make} on each
 of their subdirectories.  This forms a natural recursive tree walk of 
-the Axiom source system directory structure. Third, they have to 
+the OpenAxiom source system directory structure. Third, they have to 
 explain all of the details about the directory, the files and the 
 target rules it manages and its subdirectories.
 
 This section also serves as a reference for the meaning of the
-general targets and variables within the \Tool{Axiom} build system.
+general targets and variables within the \Tool{OpenAxiom} build system.
 
 \subsection{Standard targets}
 \label{sec:general-structure:std-targets}
 
 This section describes the meaning of \Tool{Make} targets present in every 
-Makefile of the \Tool{Axiom} build system.  These are quite standard,
-so that \Tool{Axiom} can be built just like most software using the 
+Makefile of the \Tool{OpenAxiom} build system.  These are quite standard,
+so that \Tool{OpenAxiom} can be built just like most software using the 
 GNU build machinery.  All of the targets discussed in this sub-section
 are recursive.
 
 \subsubsection{[[all]]}
 \label{sec:general-structure:std-targets:all}
 
-This target builds all of the \Tool{Axiom} sub-system controlled by the
+This target builds all of the \Tool{OpenAxiom} sub-system controlled by the
 specific \File{Makefile}.  In particular, the [[all]] target in the
-toplevel \File{Makefile} builds all the \Tool{Axiom} system.
+toplevel \File{Makefile} builds all the \Tool{OpenAxiom} system.
 
 According to GNU standard practice, the [[all]] target should not
 build documentation files and those should be explicitly asked for.
-However, \Tool{Axiom} uses the literate programming paradigm (which is
+However, \Tool{OpenAxiom} uses the literate programming paradigm (which is
 not mainstream in most GNU software).  Consequently, some rules must 
 be broken somewhere.  Which ones and where are questions not answered;
 those would be suject to discussion.
@@ -55,7 +55,7 @@ those would be suject to discussion.
 \subsubsection{[[install]]}
 \label{sec:general-structure:std-targets:install}
 
-The purpose of this target is to build \Tool{Axiom} and install for
+The purpose of this target is to build \Tool{OpenAxiom} and install for
 use.  The build system is set up  so that if [[make all]] just completed
 then [[make install]] will not modify any file in the build directory,
 Consequently it is possible to issue [[make all]] as one
@@ -65,7 +65,7 @@ superuser.
 
 At the moment [[make install]] will create the sub-directory \File{axiom}
 under the directory given [[$(prefix)]] --- default \File{/usr/local} ---
-and install the \Tool{Axiom} systen there.  We don't use
+and install the \Tool{OpenAxiom} systen there.  We don't use
 [[$(exec_prefix)]] yet --- and we should.
 
 \paragraph{Pre-installation commands.}
@@ -241,7 +241,7 @@ FIXME: To be written
 \section{The Build Flow}
 \label{sec:build-flow}
 
-The build flow of \Tool{Axiom} seems, first, a bit intricate to describe.
+The build flow of \Tool{OpenAxiom} seems, first, a bit intricate to describe.
 This description is STILL IN WORK IN PROGRESS.  Therefore it is
 incorrekt, incomplet, and iNconSiStenT.
 
@@ -254,7 +254,7 @@ the build environment, we are done.  In fact, currently we do insist that
 the Lisp runtime system is \Tool{GCL}.  Otherwise, we have to build one.
 
 Third, we have to make the subdirectory \File{src/} where all the
-work actually happens.  Part of \Tool{Axiom} is written in Boot, part
+work actually happens.  Part of \Tool{OpenAxiom} is written in Boot, part
 in Common Lisp, part in C, and the rest in SPAD.  The SPAD compiler
 is written partly in Boot, thefore \File{src/algebra/}, 
 \File{src/input/}, \File{src/interp/} depend on \File{src/boot/}.  The rest
@@ -293,7 +293,7 @@ Hue. This discussion is better done in src/Makefile.  Move it there.
 
 \subsection{Build components}
 
-Building \Tool{Axiom} consists of building several logical components.
+Building \Tool{OpenAxiom} consists of building several logical components.
 These loosely correspond to the sub-directories of \File{src/} shown in
 the previous section.  They can be built individually by invoking 
 [[make all-xxx]] where [[xxx]] is one of
@@ -302,11 +302,11 @@ the previous section.  They can be built individually by invoking
    input interpsys lib lisp sman src
 \end{verbatim}
 
-The \Tool{Axiom} source files reside in \File{src/}.  The directory
+The \Tool{OpenAxiom} source files reside in \File{src/}.  The directory
 \File{gcl/} contains the source code for \Tool{GCL}.  They are 
 not formally part of the  
-\Tool{Axiom} distribution.  Rather, they are tools \Tool{Axiom} depends on.
-They are bundled with the \Tool{Axiom} source code only for convenience.
+\Tool{OpenAxiom} distribution.  Rather, they are tools \Tool{OpenAxiom} depends on.
+They are bundled with the \Tool{OpenAxiom} source code only for convenience.
 
 \section{The Top Level \File{Makefile}}
 <<*>>=
@@ -342,7 +342,6 @@ $(AXIOM_SRC_TARGETS):
 <<rootdirs>>
 
 <<gcl>>
-<<book>>
 <<install>>
 
 mostlyclean-local:
@@ -401,135 +400,28 @@ the [[SPAD]] variable should look like:
 
 \subsubsection{SYS}
 From the [[SPAD]] variable we look at the last directory name
-and create a version of Axiom for that system. The [[SYS]]
+and create a version of OpenAxiom for that system. The [[SYS]]
 environment variable is the last directory name in the [[SPAD]]
 variable.
 
-\subsubsection{SPD}
-The [[SPD]] variable is taken to be the current working directory
-where this Makefile lives. This is obviously the root of the whole
-system source tree. All Makefiles form environment variables based
-on this value.
-
-Next we see the six top-level directories discussed above being
-defined using the [[SPD]] variable. 
-
 \subsubsection{AXIOM\_X11\_CFLAGS}
 
 The variable [[AXIOM_X11_CFLAGS]] holds the C compiler flags necessary
-to compile part of Axiom that depends on the X Window System.  It is
+to compile part of OpenAxiom that depends on the X Window System.  It is
 computed at configure-time, based on the characteristics of the target
 platform. 
 
 \subsubsection{AXIOM\_X11\_LDFLAGS}
 
 The variable [[AXIOM_X11_LDFLAGS]] holds the linker flags necessary
-for parts of Axiom thar depends on the X Window System.  It is
+for parts of OpenAxiom thar depends on the X Window System.  It is
 computed at configure-time, based on the characteristics of the target
 platform. 
 
-\subsubsection{INT}
-
-The [[INT]] subdirectory is a machine-generated, system-independent
-top-level directory containing source code. Axiom builds from literate
-sources.  This work only needs to be done once at the first build. The
-[[INT]] directory is a cache of work. It can be erased at will. 
-However steps such as generating lisp code from spad code, while
-done by machine, are system-independent. Therefore this subdirectory,
-once built, can reside with the [[$(top_srcdir)/src]] subdirectory on CD
-or NFS as a read-only branch.
-
-\subsubsection{ZIPS}
-The [[ZIPS]] subdirectory contains particular versions of subsystems
-that Axiom needs in tar-gzip format. The Makefiles will unpack them.
-It also contains patch files to these subsystems. The Makefile will
-apply those patches. Then it will configure and build the required
-subsystems.
-
-\subsubsection{TMP}
-The [[TMP]] directory is used in place of [[/tmp]] in order to
-avoid writing outside of our build tree.
-
-Note that TMP is a workspace in the current build directory. It is
-working space for temporary files since we cannot assume that
-we can write outside our own tree. Output from commands like
-the [[document]] command will generally be written to the
-[[TMP/trace]] file. If the build seems to hang while making a
-document file then check this file. It will contain the output
-of the latex command and the likely error in the tex file.
-
-\subsubsection{SPADBIN}
-The [[SPADBIN]] directory is the path to the executable 
-binary directory of the shipped system. The directory contains
-all of the executable commands, such as the [[document]]
-command. The [[document]] command lives in the [[src/scripts]]
-subdirectory and will be copied to [[SPADBIN]] before we start
-walking the build subtree.
-
 \subsubsection{INC}
 The [[INC]] directory contains all the include files for the C
 programs.
 
-\subsubsection{CCLBASE}
-The [[CCLBASE]] subdirectory contains the path to the [[CCL]]
-version of lisp. This was the original lisp used by NAG. 
-
-\subsubsection{The [[NOISE]] variable }
-The [[NOISE]] variable is used in the calls to the document
-command. In general, where the document command is called in
-the Makefiles it is called with the following form:
-\begin{verbatim}
-   ${SPADBIN}/document ${NOISE} foo
-\end{verbatim}
-with the default value of {\bf NOISE} being:
-\begin{verbatim}
-   NOISE="-o ${TMP}/trace"
-\end{verbatim}
-
-The reason [[NOISE]] exists is that the latex command will
-generate a page of output which is uninteresting during the
-make. However if there is a latex syntax error in a pamphlet
-file the make will continue past the error due to the nonstopmode
-flag. To see the actual error message rerun the make as:
-\begin{verbatim}
-  make NOISE=
-\end{verbatim}
-
-\subsubsection{PART and SUBPART}
-Because of the size of this build we do everything possible to
-minimize the work necessary to rebuild. In order to allow
-finer control of the build we have two options that can be
-specified. The first is the [[PART]] variable. The second
-is the [[SUBPART]] variable. The [[PART]] variable basically
-specifies which directory we wish to build.
-
-Setting the PART as:
-
-PART=foo
-
-will look for a stanza in the Makefile as:
-
-\${PART}dir 
-
-which expands to:
-
-foodir
-
-Variable PART can be specified (environment or command-line) as
-one of:
-
-\begin{verbatim}
- (all | lib | install | lisp | interp | comp | graph | hyper 
-      | clef | input | sman | boot | include | doc | algebra )
-\end{verbatim}
-
-It is possible to be more specific with a directory.
-<<part>>=
-PART=	cprogs
-SUBPART= everything
-
-@
-
 \subsubsection{[[subdir]]}
 
 This variable should be defined every Makefile.  It shall contain the
@@ -544,7 +436,7 @@ configuration time --- to recreate a particular Makefile if needed.
 \subsubsection{The [[axiom]] command}
 The install directory prefix is \File{/usr/local/} by default.  This 
 means that the script \Tool{axiom} is installed in the directory
-\File{/usr/local/bin/}, and the rest of the \Tool{Axiom} system
+\File{/usr/local/bin/}, and the rest of the \Tool{OpenAxiom} system
 is installed in \File{/usr/local/lib/axiom/}.  The install directory
 prefix can be defined at configure time using the option
 \verb!--prefix!.
@@ -555,15 +447,13 @@ changed on the command line.
 <<environment>>=
 
 ## ----------------------------------------
-## -- Old-style Axiom makefile variables --
+## -- Old-style OpenAxiom makefile variables --
 ## ----------------------------------------
 
 GCLOPTS=@GCLOPTS@
 
 <<pamphlets>>
 
-<<part>>
-
 @
 \subsection{rootdirs}
 Note that the -p (parent) option to mkdir will make all intermediate
@@ -576,39 +466,9 @@ stamp-rootdirs: $(axiom_build_document)
 
 @
 
-\subsection{book}
-This stanza constructs the book from the original pamphlet file.
-At this time there is no difference between the pamphlet file
-and straight latex (intentionally). Thus we just need to make 
-sure the correct directories are in place, copy the files, and
-run latex over the pamphlet file.
-
-<<book>>=
-book:
-	@ echo 79 building the book as $(axiom_target_docdir)/book.dvi 
-	@ mkdir -p ${TMP}
-	@ mkdir -p $(axiom_target_docdir)
-	@ $(INSTALL) $(axiom_src_docdir)/book.pamphlet $(axiom_target_docdir)
-	@ cp -pr $(axiom_src_docdir)/ps $(axiom_target_docdir)
-	@ (cd $(axiom_target_docdir) ; \
-          if [ .${NOISE} = . ] ; then \
-	    ( latex book.pamphlet --interaction nonstopmode ; \
-	      latex book.pamphlet --interaction nonstopmode ) ; \
-	   else \
-	    ( latex book.pamphlet --interaction nonstopmode >${TMP}/trace ; \
-	      latex book.pamphlet --interaction nonstopmode >${TMP}/trace ) ; \
-	  fi ; \
-	  rm book.pamphlet ; \
-	  rm book.toc ; \
-	  rm book.log ; \
-	  rm book.aux )
-	@ echo 80 The book is at $(axiom_target_docdir)/book.dvi 
-
-@
-
 \subsection{\File{gcl/}}
 
-At the moment, \Tool{Axiom} uses \Tool{GCL} as its Lisp platform.
+At the moment, \Tool{OpenAxiom} uses \Tool{GCL} as its Lisp platform.
 \Tool{GCL} may not be available for a given host.  In that case,
 we must build a running image.
 
@@ -621,7 +481,7 @@ The \File{gcl} binary will be accessible as
 
 The augmented fresh Lisp image is also accessible as
 [[$(axiom_build_bindir)/lisp$(EXEEXT)]] for use to build Boot translators
-and the \Tool{Axiom} interpreter and compiler.
+and the \Tool{OpenAxiom} interpreter and compiler.
 
 \subsubsection{\File{src/lisp}}
 
@@ -650,13 +510,13 @@ $(axiom_build_bindir)/gcl$(EXEEXT):
 \subsection{install}
 <<install>>=
 install:
-	@echo Installing Axiom in $(prefix)
-	@mkdir -p $(DESTDIR)$(libdir)/axiom
-	@cp -pr $(builddir)/target $(DESTDIR)$(libdir)/axiom
+	@echo Installing OpenAxiom in $(prefix)
+	@mkdir -p $(DESTDIR)$(libdir)/open-axiom
+	@cp -pr $(builddir)/target $(DESTDIR)$(libdir)/open-axiom
 	@ rm -f $(bindir)/axiom
 	@ $(mkinstalldirs) $(bindir)
 	@ $(INSTALL_PROGRAM) src/scripts/axiom $(bindir)
-	@echo Axiom installation finished.
+	@echo OpenAxiom installation finished.
 @
 
 Until now, pamphlet files are also \LaTeX{}ed as part of a normal build.
@@ -706,10 +566,6 @@ On most systems the gnu toolset is the default. Thus we can just use
 specify that we are using the gnu toolset, and we need to use
 [[gpatch]] instead of [[patch]].
 
-\subsubsection{The [[RANLIB]] variable }
-
-\subsubsection{The [[TOUCH]] variable }
-
 \subsubsection{The [[AXIOMXLROOT]] variable }
 
 \subsubsection{The [[O]] variable }
@@ -718,28 +574,24 @@ This defaults to ``o'' so a compile of foo.lisp becomes foo.o
 but other systems prefer .fasl so a compile of foo.lisp becomes
 foo.fasl. Change this based on the target lisp.
 
-\subsubsection{The [[BYE]] variable }
-
-\subsubsection{The [[LISP]] variable }
-
 \subsubsection{The [[DAASE]] variable}
-Axiom uses 5 files, the *.daase files, which are called ``the
+OpenAxiom uses 5 files, the *.daase files, which are called ``the
 databases''. They contain cross-reference, signatures,
 and other information needed by the interpreter and compiler.
 When the system is being built from scratch these databases
 need to exist. However, they get dynamically rebuilt after
 the algebra files are compiled. The bootstrap versions of these
-databases live in the [[src/share]] subdirectory. Axiom will
+databases live in the [[src/share]] subdirectory. OpenAxiom will
 use the value of the shell variable [[DAASE]] to find its 
 databases. If this variable is unbound it uses the standard
-[[$(axiom_targetdir)]] path. Note that Axiom will append the string
+[[$(axiom_targetdir)]] path. Note that OpenAxiom will append the string
 [[/algebra]] to the value of [[DAASE]]. The default value setting
 given here is:
 
 [[DAASE=$(axiom_src_datadir)]]
 
 so [[$(axiom_src_datadir)/algebra/*.daase]] will be the
-Axiom bootstrap database files.
+OpenAxiom bootstrap database files.
 
 \subsection{Makefile.MACOSX}
 On the MAC OSX someone decided (probably a BSDism) to rename the
@@ -754,7 +606,7 @@ moved on this platform.
 We need to explicitly put [[-I/usr/include]] before 
 [[-I/usr/include/sys]] because the MAC seems to search in a
 different order than linux systems. The [[sys]] versions of 
-the include files are broken, at least for Axiom use.
+the include files are broken, at least for OpenAxiom use.
 
 
 
@@ -805,7 +657,7 @@ They are handled by generic cleanup rules
 \item [[distclean-generic]]
 \end{itemize}
 For instances, they delete intermediate files produced by \LaTeX{}.
-If you're writing a new Makefile for Axiom, you do not have to
+If you're writing a new Makefile for OpenAxiom, you do not have to
 define these rules.
 
 \subsection{[[local cleanups]]}
@@ -824,14 +676,5 @@ Notice that each Makefile should define those targets, even if they do
 nothing. 
 
 
-\eject
-\begin{thebibliography}{99}
-\bibitem{1} CMUCL {\bf http://www.cons.org/cmucl}
-\bibitem{2} GCL {\bf http://savannah.gnu.org/projects/gcl}
-\bibitem{3} Codemist Ltd, ``Alta'', Horsecombe Vale Combs Down
-Bath BA2 5QR UK Tel. +44-1225-837430 
-{\bf http://www.codemist.co.uk}
-\bibitem{5} \$SPAD/zips/advi-1.2.0.tar.gz, the advi source tree
-\end{thebibliography}
 \end{document}
 
diff --git a/TODO b/TODO
index 4674cfcc..8b57d4a3 100644
--- a/TODO
+++ b/TODO
@@ -2,6 +2,14 @@
 === TODO ===
 ============
 
+* Support more Lisp systems
+* Better support on Windows platform (MinGW/MSYS)
+* Modernize algebras
+* Better documentations
+* Interfaces to mainstream programming languages
+* Improve Boot, Spad
+* Integrate to development environments
+
 * Revisit the underlying definition of the types DFlo in foam
   interface, and Float in OpenAxiom.
 
diff --git a/configure b/configure
index 5d33cee7..ce097b2a 100755
--- a/configure
+++ b/configure
@@ -19060,8 +19060,8 @@ test -n "$target_alias" &&
 if test $build != $target; then
    { echo "$as_me:$LINENO: WARNING: Cross build is not supported." >&5
 echo "$as_me: WARNING: Cross build is not supported." >&2;}
-   { echo "$as_me:$LINENO: WARNING: Please notify axiom-developer@nongnu.org if you succeed." >&5
-echo "$as_me: WARNING: Please notify axiom-developer@nongnu.org if you succeed." >&2;}
+   { echo "$as_me:$LINENO: WARNING: Please notify open-axiom-devel@open-axiom.org if you succeed." >&5
+echo "$as_me: WARNING: Please notify open-axiom-devel@open-axiom.org if you succeed." >&2;}
 fi
 ## Where tools for the build platform are sequestered
 axiom_build_sharedir=$axiom_builddir/share
diff --git a/configure.ac b/configure.ac
index 5b51f5ed..e8dafa87 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@ AC_SUBST(axiom_src_subdirs)
 AC_CANONICAL_SYSTEM
 if test $build != $target; then
    AC_MSG_WARN([Cross build is not supported.])
-   AC_MSG_WARN([Please notify axiom-developer@nongnu.org if you succeed.])
+   AC_MSG_WARN([Please notify open-axiom-devel@open-axiom.org if you succeed.])
 fi
 ## Where tools for the build platform are sequestered
 axiom_build_sharedir=$axiom_builddir/share
diff --git a/configure.ac.pamphlet b/configure.ac.pamphlet
index 8959fee5..b17e3cd3 100644
--- a/configure.ac.pamphlet
+++ b/configure.ac.pamphlet
@@ -139,7 +139,7 @@ a warning when we detect attempt at cross build:
 <<host build target platfoms>>=
 if test $build != $target; then
    AC_MSG_WARN([Cross build is not supported.])
-   AC_MSG_WARN([Please notify axiom-developer@nongnu.org if you succeed.])
+   AC_MSG_WARN([Please notify open-axiom-devel@open-axiom.org if you succeed.])
 fi
 @
 Note that we do not stop the configuration process because we do seek
diff --git a/src/interp/Makefile.pamphlet b/src/interp/Makefile.pamphlet
index a5024ddb..8cfd56e7 100644
--- a/src/interp/Makefile.pamphlet
+++ b/src/interp/Makefile.pamphlet
@@ -65,7 +65,7 @@ COMPILE_LISP = $(DEPSYS) -- --compile --output=$@ $<
 
 \subsection{Autloload}
 
-In order to minimize the size of the Axiom image at load time
+In order to minimize the size of the OpenAxiom image at load time
 we put some of the compiled files into a separate directory
 that will be autoloaded on demand. This directory of code
 will be shipped with the final system and so it belongs in
@@ -211,7 +211,7 @@ The [[depsys]] image is made of the following Lisp source files
     It is not needed for translating Boot codes to Common Lisp.
 
     \item[\File{axext\_l.lisp}]  This file defines various macros and
-    functions for interoperability between Aldor and Axiom.  Not needed
+    functions for interoperability between Aldor and OpenAxiom.  Not needed
     for translating Boot codes to Common Lisp.
   \end{description}
 
@@ -329,7 +329,7 @@ DEBUGSYS=$(axiom_build_bindir)/debugsys$(EXEEXT)
 
 These are the files that need to be compiled (in {\bf BOOTSYS}),
 loaded into a clean lisp image ({\bf LOADSYS}) and saved as
-a runnable \Tool{Axiom} interpreter ({\bf SAVESYS}) usually named
+a runnable \Tool{OpenAxiom} interpreter ({\bf SAVESYS}) usually named
 \Tool{interpsys}. Most of these files
 are translated from Boot to Common Lisp and then 
 compiled. There are two exceptions, \File{bootfuns.lisp}
@@ -579,7 +579,7 @@ ASAUTO= ${AUTO}/ax.$(FASLEXT)
 autoload_objects += $(ASAUTO)
 @
 
-Axiom versions are given as a string of the form:
+OpenAxiom versions are given as a string of the form:
 "Sunday September 21, 2003 at 20:38:05 "
 which describe the day, date, and time of the build.
 This is used for reporting bugs. It is only partially useful
@@ -589,7 +589,7 @@ and use the MD5 hash of that file as the version stamp. Ultimately
 though, this would be chasing the elusive "perfect information" idea.
 
 A new variable [[boot::*build-version*]] is set here and used by the
-[[yearweek]] function to display the version number of the Axiom build.
+[[yearweek]] function to display the version number of the OpenAxiom build.
 This information is set by hand in the top level Makefile.
 <<environment>>=
 TIMESTAMP=$(axiom_targetdir)/timestamp
@@ -1095,7 +1095,7 @@ tail-recursive call. This happens when the last form in a function
 is a call to the same function. In general, we don't care so we set
 compiler::*suppress-compiler-notes* to true in order to reduce the noise.
 
-Notice that when Axiom uses GCL as the Lisp platform, it is usually not 
+Notice that when OpenAxiom uses GCL as the Lisp platform, it is usually not 
 a good idea to mess with GCL's internal variables.  In particular, GCL
 has its own idea about what to do with [[si::*system-directory*]], which 
 should not be set here just because we happen to save an GCL-based image.
diff --git a/src/interp/bookvol5.pamphlet b/src/interp/bookvol5.pamphlet
index 5a7bd281..c4bd1142 100644
--- a/src/interp/bookvol5.pamphlet
+++ b/src/interp/bookvol5.pamphlet
@@ -290,7 +290,7 @@ where the Lisp image has been started.
 The [[reroot]] function sets this variable to the value of
 [[$spadroot]] which itself has the value of the argument to the
 [[reroot]] function. Since the argument to the [[reroot]] function is
-an string which represents an absolute pathname pointing to AXIOM the
+an string which represents an absolute pathname pointing to OpenAxiom the
 net result is that the [[$current-directory]] is set to point to the
 shell [[AXIOM]] variable.
 
@@ -1389,12 +1389,12 @@ S2IZ0076
  do you really want to import everything from the frame %1b ?
  If so, please enter %b y %d or %b yes %d :
 S2IZ0077
- On your request, AXIOM will not import everything from frame %1b.
+ On your request, OpenAxiom will not import everything from frame %1b.
 S2IZ0078
  Import from frame %1b is complete. Please issue %b )display all %d
  if you wish to see the contents of the current frame.
 S2IZ0079
- AXIOM cannot import %1b from frame %2b because it cannot be found.
+ OpenAxiom cannot import %1b from frame %2b because it cannot be found.
 @
 \chapter{The Undo Mechanism}
 \section{)undo}
@@ -1632,19 +1632,11 @@ DEBUGSYS=${OBJ}/${SYS}/bin/debugsys
 @
 \chapter{Makefile.bookvol5}
 <<*>>=
-LATEX=/usr/bin/latex
-LISP=${AXIOM}/obj/linux/bin/lisp
-TANGLE=/usr/local/bin/NOTANGLE
-WEAVE=/usr/local/bin/NOWEAVE -delay
 
 all: bookvol5
 	@echo 0 done
 
 bookvol5: bookvol5.pamphlet
-	@echo 1 extracting the bookvol5reter
-	${WEAVE} bookvol5.pamphlet >bookvol5.tex
-	${LATEX} bookvol5.tex
-	${LATEX} bookvol5.tex
 	${TANGLE} -R"Interpreter" bookvol5.pamphlet >bookvol5.lisp
 
 remake:	
diff --git a/src/scripts/axiom.in b/src/scripts/axiom.in
index 3b1b7c3c..29d896bb 100644
--- a/src/scripts/axiom.in
+++ b/src/scripts/axiom.in
@@ -26,7 +26,7 @@
 ## Where The Axiom system resides
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-AXIOM=@libdir@/axiom/target/@target@
+AXIOM=@libdir@/open-axiom/target/@target@
 export AXIOM
 
 ## We adjust the value of PATH here because, currently, some Axiom 
diff --git a/src/share/ChangeLog b/src/share/ChangeLog
index c24815fc..5b1fc53c 100644
--- a/src/share/ChangeLog
+++ b/src/share/ChangeLog
@@ -1,3 +1,7 @@
+2007-08-14  Gabriel Dos Reis  <gdr@cs.tamu.edu>
+
+	* doc/msgs/s2-us.msgs: Consistently use OpenAxiom.
+
 2006-11-24  Gabriel Dos Reis  <gdr@cs.tamu.edu>
 
 	* Makefile.pamphlet (all-share): New phony target.
diff --git a/src/share/doc/msgs/s2-us.msgs b/src/share/doc/msgs/s2-us.msgs
index 891734c4..955ffbd9 100644
--- a/src/share/doc/msgs/s2-us.msgs
+++ b/src/share/doc/msgs/s2-us.msgs
@@ -75,7 +75,7 @@ S2IB0008f
  Perhaps package-calling the operation or using coercions on the
  arguments will allow you to apply the operation.
 S2IB0009
- AXIOM will attempt to step through and interpret the code.
+ OpenAxiom will attempt to step through and interpret the code.
 S2IB0010
  Cannot resolve type of value and declared partial type.
 S2IB0011
@@ -183,7 +183,7 @@ S2IF0008
 S2IF0009
  The domain %1bp does not belong to the category %2bp .
 S2IF0010
- %1b is not a known function.  AXIOM will try to list its functions
+ %1b is not a known function.  OpenAxiom will try to list its functions
  which contain %1b in their names.  This is the same output you
  would get by issuing %ceon %b )what operations %1 %d %ceoff
 S2IF0011
@@ -316,7 +316,7 @@ S2IL0017
  the selection:
 S2IL0018
  Your request to cancel the selection has been accepted. You are now
- being returned to the top level of AXIOM.
+ being returned to the top level of OpenAxiom.
 S2IL0019
  %1b is not known to be a valid abbreviation for a constructor.
  If necessary, use the %b )abbreviation %d system command to create
@@ -371,11 +371,11 @@ S2IM0009
  be further processed. It would probably help if you declared the function.
  The functions/rules that were being analyzed were: %l %b %2 %d
 S2IM0010
- AXIOM cannot compile or interpret code for function %1b .
+ OpenAxiom cannot compile or interpret code for function %1b .
 S2IM0011
- AXIOM cannot determine the type for function %1b . Please declare it.
+ OpenAxiom cannot determine the type for function %1b . Please declare it.
 S2IM0012
- AXIOM cannot determine the type of %1b because it cannot analyze the
+ OpenAxiom cannot determine the type of %1b because it cannot analyze the
  non-recursive part, if that exists.  This may be remedied by declaring
  the function.
 S2IM0013
@@ -401,22 +401,22 @@ S2IM0027
 S2IP0001
  The left-hand side of a %b => %d form must be a symbol.
 S2IP0002
- AXIOM cannot now process %b ! %d in the way you have used it.
+ OpenAxiom cannot now process %b ! %d in the way you have used it.
  Use parentheses, if appropriate.
 S2IP0003
  Argument number %1b of %2bp must have type %3bp .
 S2IP0004
  %1 macro %2b .
 S2IP0005
- %1b is not a valid identifier to use in AXIOM.
+ %1b is not a valid identifier to use in OpenAxiom.
 S2IR0001
  Cannot resolve all the types in the list to be created.
 S2IR0002
- AXIOM cannot handle %b [ ] %d here.
+ OpenAxiom cannot handle %b [ ] %d here.
 S2IR0003
  The types that cannot be resolved are: %1b
 S2IR0004
- AXIOM is confused by what you input.  It cannot resolve the
+ OpenAxiom is confused by what you input.  It cannot resolve the
  type %1bp with the partial type %2bp .
  Please make sure you have used the correct syntax.
 S2IR0005
@@ -436,7 +436,7 @@ S2IS0005
  The index variable in an iterator must be a symbol and %1 is not
  one.
 S2IS0006
- AXIOM cannot iterate with %1b over your form now.
+ OpenAxiom cannot iterate with %1b over your form now.
  Perhaps you should try using a conversion to make sure your form is
  a list or stream, for example.
 S2IS0007
@@ -444,14 +444,14 @@ S2IS0007
 S2IS0008
  The step value in a loop must be a constant integer.
 S2IS0009
- AXIOM can only iterate over lists now and you supplied an
+ OpenAxiom can only iterate over lists now and you supplied an
  object of type %1bp .
 S2IS0010
  Cannot resolve types in collect body.
 S2IS0011
  Interpret-Code mode is not supported for stream bodies.
 S2IS0013
- AXIOM does not understand what you mean when you specify %b [
+ OpenAxiom does not understand what you mean when you specify %b [
  ] %d as having the type %1bp .
 S2IS0014
  Cannot compile the declaration for %1b because its
@@ -519,10 +519,10 @@ S2IS0039
  If there is a tuple on the left-hand side of an assignment then
  there must also be one on the right-hand side.
 S2IS0040
- AXIOM cannot now handle assignments to scripted variables
+ OpenAxiom cannot now handle assignments to scripted variables
  with more than one script.  You can use %b == %d however.
 S2IS0041
- AXIOM can now only handle undeclared %b Table %d
+ OpenAxiom can now only handle undeclared %b Table %d
  assignments with a single key. Try using the form %1b .
 S2IS0047
  The %b return %d keyword can only be used within a function.
@@ -550,7 +550,7 @@ S2IS0055
 S2IS0056
  Anonymous user functions created with %b +-> %d that are processed in
  interpret-code mode must have result target information available.
- This information is not present so AXIOM cannot proceed any further.
+ This information is not present so OpenAxiom cannot proceed any further.
  This may be remedied by declaring the function.
 S2IS0057
  All parameters to anonymous user maps must identifiers, possibly in
@@ -584,7 +584,7 @@ S2IT0006
  %1 The %b )trace %d option %b )only %d does not permit %2b as a legal
  option.
 S2IT0007
- %1 AXIOM does not understand the %b )trace %d option %2b which you used.
+ %1 OpenAxiom does not understand the %b )trace %d option %2b which you used.
 S2IT0008
  %1 The %b )trace %d option %b )break %d can only have one or both of
  %b before %d and %b after %d as arguments.
@@ -608,7 +608,7 @@ S2IT0016
 S2IT0017
  There are %1b problems with your %b )trace %d system command:
 S2IT0018
- AXIOM does not understand the use of %1b here.
+ OpenAxiom does not understand the use of %1b here.
 S2IT0019
  If you use the %b )off %d option for %b )trace %d and you also use
  the %b )local %d or %b )ops %d option, you must specify the name
@@ -629,7 +629,7 @@ S2IU0003
  The %b )load %d system command is obsolete. Please use the %b )library %d
  command instead.
 S2IV0001
- %b )set streams calculate %d is used to tell AXIOM
+ %b )set streams calculate %d is used to tell OpenAxiom
  how many elements of a stream to calculate when a
  computation uses the stream.  The value given after %b calculate %d must
  either be the word %b all %d or a positive integer.  %l %l The current
@@ -739,7 +739,7 @@ S2IZ0031
  Please enter %b y %d or %b yes %d if you really want to leave the
  interactive environment and return to the operating system:
 S2IZ0032
- You have chosen to remain in the %b AXIOM %d
+ You have chosen to remain in the %b OpenAxiom %d
  interactive environment.
 S2IZ0033
  You cannot %b )read %d the file %1b because your user-level is not is
@@ -747,7 +747,7 @@ S2IZ0033
  )set userlevel %d .
 S2IZ0034
  You cannot %b )read %d the file %1b because it is not suitable for
- reading by AXIOM.  Note that files with file extension %b .spad %d
+ reading by OpenAxiom.  Note that files with file extension %b .spad %d
  and %b .as %d can now only be compiled with the %b )compile %d system command.
 S2IZ0035
  The file %1b will not be added to the list of working source files
@@ -757,13 +757,13 @@ S2IZ0036
 S2IZ0037
  %1b requires and argument and you do not give one.
 S2IZ0038
- Compiling AXIOM source code from file %1b using old system compiler.
+ Compiling OpenAxiom source code from file %1b using old system compiler.
 S2IZ0038A
- Compiling AXIOM source code from file %1b using AXIOM-XL compiler and
+ Compiling OpenAxiom source code from file %1b using AXIOM-XL compiler and
  options %b %ceon %2 %ceoff %d
  Use the system command %b )set compiler args %d to change these options.
 S2IZ0039
- Only AXIOM source files with file extensions
+ Only OpenAxiom source files with file extensions
  %b .as, .ao, .al, %d or %b .spad %d can be compiled.
 S2IZ0040
  The %b )constructor %d option to %b )compile %d must also be
@@ -790,7 +790,7 @@ S2IZ0044M
  for the mapping.
  For example, Mapping(T, A, B) denotes the
  class of mappings from (A, B) into T. %l
- This constructor is a primitive in AXIOM.
+ This constructor is a primitive in OpenAxiom.
  For more information, use the HyperDoc Browser.
 S2IZ0044R
  Record(a:A,...,b:B) %l
@@ -800,7 +800,7 @@ S2IZ0044R
  ... %l
  b, a selector, an element of domain Symbol %l
  B, a domain of category SetCategory %u %l
- This constructor is a primitive in AXIOM.
+ This constructor is a primitive in OpenAxiom.
  The selectors a,...,b of a Record type must be distinct. %l %l
  In order for more information to be displayed about %1b ,
  you must give it specific arguments. For example: %2b %l
@@ -813,7 +813,7 @@ S2IZ0045T
  ... %l
  b, a tag, an element of domain Symbol %l
  B, a domain of category SetCategory %u %l
- This constructor is a primitive in AXIOM.
+ This constructor is a primitive in OpenAxiom.
  In this tagged Union, tags a, ..., b must be distinct. %l %l
  In order for more information to be displayed about %1b ,
  you must give it specific arguments. For example: %2b %l
@@ -917,7 +917,7 @@ S2IZ0051
 S2IZ0052
  It is mostly likely a %b )set %d command. Please inspect the file.
 S2IZ0053
- AXIOM initialization: %1b
+ OpenAxiom initialization: %1b
 S2IZ0054
  %1b is unknown to us, so no information is available.
 S2IZ0055
@@ -932,7 +932,7 @@ S2IZ0057
  Since you did not respond with %b y %d or %b yes %d the list of
  abbreviations will not be displayed.
 S2IZ0058
- You have requested that all information about all AXIOM
+ You have requested that all information about all OpenAxiom
  operations (functions) be displayed.  As there are several hundred
  operations, please confirm your request by typing %b y %d or %b yes %d
  and then pressing %b Enter %d :
@@ -975,11 +975,11 @@ S2IZ0069C
  Bad file format in file %1b : a group name should not contain blanks.
  The improper group name is %2b
 S2IZ0070
- The current AXIOM default directory is %1b
+ The current OpenAxiom default directory is %1b
 S2IZ0071
- You cannot close this AXIOM session.
+ You cannot close this OpenAxiom session.
 S2IZ0072
- This is the last AXIOM session.  Do you want to kill AXIOM?
+ This is the last OpenAxiom session.  Do you want to kill OpenAxiom?
 S2IZ0073
  %b )frame import %d must be followed by the frame name. The names
  of objects in that frame can then optionally follow the frame name.
@@ -1002,12 +1002,12 @@ S2IZ0076
  do you really want to import everything from the frame %1b ?
  If so, please enter %b y %d or %b yes %d :
 S2IZ0077
- On your request, AXIOM will not import everything from frame %1b .
+ On your request, OpenAxiom will not import everything from frame %1b .
 S2IZ0078
  Import from frame %1b is complete. Please issue %b )display all %d
  if you wish to see the contents of the current frame.
 S2IZ0079
- AXIOM cannot import %1b from frame %2b because it cannot be found.
+ OpenAxiom cannot import %1b from frame %2b because it cannot be found.
 S2IZ0080
  Unknown system command: %1b
 S2IZ0081
@@ -1015,7 +1015,7 @@ S2IZ0081
  %b )compile %d system command. If you give the %b )translate %d option
  then you cannot also give the %b )new %d option.
 S2IZ0082
- The old AXIOM system compiler can only compile files with file extension
+ The old OpenAxiom system compiler can only compile files with file extension
  ".spad".
 S2IZ0083
  The AXIOM-XL compiler can only compile files with file extensions ".as" or
@@ -1026,7 +1026,7 @@ S2IZ0085
  Warning: translation of an old-style source code ".spad" file to a new-style
  ".as" file changes the old system compiler. If you wish to use the old
  system compiler for regular compilation, you must exit and re-enter
- AXIOM.
+ OpenAxiom.
 S2IZ0086
  Cannot write to file with name %b %1  %d .
 S2IZ0087
@@ -1065,9 +1065,9 @@ S2GE0002
  start a fresh system and then restart your computation.  %l %l
  Note that you simply may not be able to perform your calculation in the
  amount of storage you have available to you.  Ask your system
- administrator if it is possible for you to run %b AXIOM %d in a
+ administrator if it is possible for you to run %b OpenAxiom %d in a
  larger virtual machine.  %l %l
- If you have questions, contact an AXIOM consultant.
+ If you have questions, contact an OpenAxiom consultant.
 S2GE0003
  The cache for %1b cannot be cleared because that function is not
  privately clammed.
@@ -1109,13 +1109,13 @@ S2GE0017
  Unexpected error in call to system function %1b
 S2GL0001
  %ceon
- %b AXIOM Computer Algebra System %d %l
+ %b OpenAxiom: The Open Scientific Computation System %d %l
  %1
  %ceoff
 S2GL0003A
  Issue %b )hd %d to start the Hyperdoc help system.
 S2GL0003B
- Issue %b )quit %d to leave AXIOM and return to %1 .
+ Issue %b )quit %d to leave OpenAxiom and return to %1 .
 S2GL0003C
  Issue %b )help %x1 ? %d to see information about the %b )help %d command.
 S2GL0004
@@ -1156,9 +1156,9 @@ S2GL0018C
 S2GL0018D
  Issue %b )summary %d for a summary of useful system commands.
 S2GL0019
- Type %b (resume) %d to return to AXIOM and continue with the next
+ Type %b (resume) %d to return to OpenAxiom and continue with the next
  statement. Type %b (toplevel) %d to abort all input files and continue
- with interactive AXIOM.
+ with interactive OpenAxiom.
 S2NR0001
  The function %1b with signature %2 is missing from domain %3b
 S2NR0002
@@ -1247,7 +1247,7 @@ S2CN0002
  The character %b %1 %d is greater than the radix.
  
 S2CN0003
- The character %b %1 %d is not an AXIOM character.
+ The character %b %1 %d is not an OpenAxiom character.
  
 S2CY0002
  Improper syntax.