--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,10 @@
+2006-05-31  John W. Eaton  <jwe@octave.org>
+
+	* interpreter/images/Makefile.in (run-octave):
+	Use $(TOPDIR)/run-octave script to execute Octave.
+	(OCTAVE_BINARY, OCTAVE_SCRIPT_PATH, OCTAVE_LD_LIBRARY_PATH,
+	XLD_LIBRARY_PATH, SET_LD_LIBRARY_PATH): Delete variables.
+
 2006-04-06  Keith Goodman  <kwgoodman@gmail.com>
 
 	* interpreter/mkoctfile.1: Doc string fix.

--- a/doc/interpreter/images/Makefile.in
+++ b/doc/interpreter/images/Makefile.in
@@ -17,25 +17,11 @@
 
 DISTFILES = Makefile.in $(SOURCES) $(IMAGES)
 
-OCTAVE_BINARY = $(TOPDIR)/src/octave
-
-OCTAVE_SCRIPT_PATH = .//:$(srcdir)//:$(TOPDIR)/src//:$(top_srcdir)/scripts//
-
-ifeq ($(SHARED_LIBS), true)
-  OCTAVE_LD_LIBRARY_PATH = $(TOPDIR)/src:$(TOPDIR)/liboctave:$(TOPDIR)/libcruft
-  ifeq ($(@library_path_var@),)
-    XLD_LIBRARY_PATH = $(OCTAVE_LD_LIBRARY_PATH)
-  else
-    XLD_LIBRARY_PATH = $(OCTAVE_LD_LIBRARY_PATH):$(@library_path_var@)
-  endif
-  SET_LD_LIBRARY_PATH = @library_path_var@="$(XLD_LIBRARY_PATH)"
-endif
-
 all: $(IMAGES)
 .PHONY: all
 
 define run-octave
-  $(SET_LD_LIBRARY_PATH) $(OCTAVE_BINARY) -f -q -H -p $(OCTAVE_SCRIPT_PATH) \
+  $(TOPDIR)/run-octave -f -q -H -p $(srcdir) \
     --eval "$(notdir $(basename $<)) ('$(notdir $(basename $@))', '$(patsubst .%,%, $(suffix $@))')"
 endef
 

--- a/scripts/ChangeLog
+++ b/scripts/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-31  Bill Denney  <bill@givebillmoney.com>
+
+ 	* miscellaneous/fileparts.m, miscellaneous/fullfile.m: Add seealso.
+ 	* miscellaneous/texas_lotto.m: Fix warning message.
+
 2006-05-26  John W. Eaton  <jwe@octave.org>
 
 	* miscellaneous/doc.m: Also handle nargin == 0.

--- a/scripts/miscellaneous/fileparts.m
+++ b/scripts/miscellaneous/fileparts.m
@@ -21,6 +21,7 @@
 ## @deftypefn {Function File} {[@var{dir}, @var{name}, @var{ext}, @var{ver}] =} fileparts (@var{filename})
 ## Return the directory, name, extension, and version components of
 ## @var{filename}.
+## @seealso{fullfile}
 ## @end deftypefn
 
 function [directory, name, extension, version] = fileparts (filename)

--- a/scripts/miscellaneous/fullfile.m
+++ b/scripts/miscellaneous/fullfile.m
@@ -20,6 +20,7 @@
 ## -*- texinfo -*-
 ## @deftypefn {Function File} {@var{filename} =} fullfile (@var{dir1}, @var{dir2}, @dots{}, @var{file})
 ## Return a complete filename constructed from the given components.
+## @seealso{fileparts}
 ## @end deftypefn
 
 function filename = fullfile (varargin)

--- a/scripts/miscellaneous/texas_lotto.m
+++ b/scripts/miscellaneous/texas_lotto.m
@@ -29,7 +29,7 @@
 function picks = texas_lotto ()
 
   if (nargin != 0)
-    warning ("win_texas_lotto: ignoring extra arguments");
+    warning ("texas_lotto: ignoring extra arguments");
   endif
 
   picks = zeros (1,6);

--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2006-05-31  John W. Eaton  <jwe@octave.org>
+
+	* load-path.h (load_path::set_command_line_path): Make it
+	additive.
+
 2006-05-26  John W. Eaton  <jwe@octave.org>
 
 	* load-path.cc (genpath, maybe_add_path_elts, Fgenpath, Frehash,

--- a/src/load-path.h
+++ b/src/load-path.h
@@ -29,6 +29,7 @@
 #include <map>
 #include <string>
 
+#include "pathsearch.h"
 #include "str-vec.h"
 
 class
@@ -159,7 +160,10 @@
 
   static void set_command_line_path (const std::string& p)
   {
-    command_line_path = p;
+    if (command_line_path.empty ())
+      command_line_path = p;
+    else
+      command_line_path += dir_path::path_sep_str + p;
   }
 
 private: